• J
    bump rename limit defaults (again) · 92c57e5c
    Jeff King 提交于
    We did this once before in 50705915 (bump rename limit
    defaults, 2008-04-30). Back then, we were shooting for about
    1 second for a diff/log calculation, and 5 seconds for a
    merge.
    
    There are a few new things to consider, though:
    
      1. Average processors are faster now.
    
      2. We've seen on the mailing list some ugly merges where
         not using inexact rename detection leads to many more
         conflicts. Merges of this size take a long time
         anyway, so users are probably happy to spend a little
         bit of time computing the renames.
    
    Let's bump the diff/merge default limits from 200/500 to
    400/1000. Those are 2 seconds and 10 seconds respectively on
    my modern hardware.
    Signed-off-by: NJeff King <peff@peff.net>
    Signed-off-by: NJunio C Hamano <gitster@pobox.com>
    92c57e5c
merge-recursive.c 49.5 KB