Revision 288f072ec033cf917eed949119428db3626ddc71 authored by Linus Torvalds on 10 August 2007, 19:21:20 UTC, committed by Junio C Hamano on 10 August 2007, 21:00:11 UTC
This optimizes bind_merge() and oneway_merge() to not unnecessarily remove and re-add the old index entries when they can just get replaced by updated ones. This makes these operations much faster for large trees (where "large" is in the 50,000+ file range), because we don't unnecessarily move index entries around in the index array all the time. Using the "bummer" tree (a test-tree with 100,000 files) we get: Before: [torvalds@woody bummer]$ time git commit -m"Change one file" 50/500 real 0m9.470s user 0m8.729s sys 0m0.476s After: [torvalds@woody bummer]$ time git commit -m"Change one file" 50/500 real 0m1.173s user 0m0.720s sys 0m0.452s so for large trees this is easily very noticeable indeed. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent b48d5a0
| File | Mode | Size |
|---|---|---|
| hstrerror.c | -rw-r--r-- | 513 bytes |
| inet_ntop.c | -rw-r--r-- | 5.0 KB |
| inet_pton.c | -rw-r--r-- | 6.9 KB |
| mmap.c | -rw-r--r-- | 747 bytes |
| pread.c | -rw-r--r-- | 433 bytes |
| setenv.c | -rw-r--r-- | 786 bytes |
| strcasestr.c | -rw-r--r-- | 431 bytes |
| strlcpy.c | -rw-r--r-- | 247 bytes |
| strtoumax.c | -rw-r--r-- | 217 bytes |
| unsetenv.c | -rw-r--r-- | 558 bytes |
Computing file changes ...
