rm: only refresh entries that we may touch
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Sun, 17 Jan 2010 08:43:13 +0000 (15:43 +0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jan 2010 23:04:23 +0000 (15:04 -0800)
This gets rid of the whole tree cache refresh. Instead only path that
we touch will get refreshed. We may still lstat() more than needed,
but it'd be better playing safe.

This potentially reduces a large number of lstat() on big trees. Take
gentoo-x86 tree for example, which has roughly 80k files:

Unmodified Git:

$ time git rm --cached skel.ebuild
rm 'skel.ebuild'

real 0m1.441s
user 0m0.821s
sys 0m0.531s

Modified Git:

$ time ~/w/git/git rm --cached skel.ebuild
rm 'skel.ebuild'

real 0m0.941s
user 0m0.828s
sys 0m0.091s

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-rm.c
index 57975dbcfd7c0dbcba03b88a1bf403f1ec5f528c..f3772c84de0a1f1a18123e55ae6e6983739f590b 100644 (file)
@@ -169,9 +169,10 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 
        if (read_cache() < 0)
                die("index file corrupt");
-       refresh_cache(REFRESH_QUIET);
 
        pathspec = get_pathspec(prefix, argv);
+       refresh_index(&the_index, REFRESH_QUIET, pathspec, NULL, NULL);
+
        seen = NULL;
        for (i = 0; pathspec[i] ; i++)
                /* nothing */;