@matheusbsbs / matheus-bagliano / commits / 22631473e0
Fork 0

Fix "git commit directory/" performance anomaly

This trivial patch avoids re-hashing files that are already clean in the index. This mirrors what commit 0781b8a9b2fe760fc4ed519a3a26e4b9bd6ccffe did for "git add .", only for "git commit ." instead. This improves the cold-cache case immensely, since we don't need to bring in all the file contents, just the index and any files dirty in the index. Before: [torvalds@woody linux]$ time git commit . real 1m49.537s user 0m3.892s sys 0m2.432s After: [torvalds@woody linux]$ time git commit . real 0m14.273s user 0m1.312s sys 0m0.516s (both after doing a "echo 3 > /proc/sys/vm/drop_caches" to get cold-cache behaviour - even with the index optimization git still has to "lstat()" all the files, so with a truly cold cache, bringing all the inodes in will take some time). [jc: trivial "return 0;" fixed] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Linus Torvalds committed Aug 10, 2007 at 09:51 UTC 22631473e0b7a33356587ba3e38a9b4cc4dba2f1
1 file changed +8 -2
builtin-update-index.c
+8 -2
@@ -86,9 +86,15 @@ static int process_lstat_error(const char *path, int err)
86
87 static int add_one_path(struct cache_entry *old, const char *path, int len, struct stat *st)
88 {
89 - int option, size = cache_entry_size(len);
90 - struct cache_entry *ce = xcalloc(1, size);
89 + int option, size;
90 + struct cache_entry *ce;
91 +
92 + /* Was the old index entry already up-to-date? */
93 + if (old && !ce_stage(old) && !ce_match_stat(old, st, 0))
94 + return 0;
95
96 + size = cache_entry_size(len);
97 + ce = xcalloc(1, size);
98 memcpy(ce->name, path, len);
99 ce->ce_flags = htons(len);
100 fill_stat_cache_info(ce, st);