diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-26 06:04:08 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-26 06:04:08 +0400 |
| commit | 5e04a1ee33f82051668f09d73cf16348169e7f1f (patch) | |
| tree | 2484cb203a6b0c68773371fc629b29536d1966c8 | |
| parent | 597a1782460085105f7530c815e79cbb1de272d9 (diff) | |
| parent | 53996fe5397ff37c5934bb5e9b23ef5985b3d152 (diff) | |
Merge branch 'lt/maint-diff-reduce-lstat' into maint
* lt/maint-diff-reduce-lstat:
Teach 'git checkout' to preload the index contents
Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
| -rw-r--r-- | builtin-checkout.c | 4 | ||||
| -rw-r--r-- | diff-lib.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index f2d7ef01b0..b8a4b0139b 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -216,7 +216,7 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec, struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); newfd = hold_locked_index(lock_file, 1); - if (read_cache() < 0) + if (read_cache_preload(pathspec) < 0) return error("corrupt index file"); if (source_tree) @@ -366,7 +366,7 @@ static int merge_working_tree(struct checkout_opts *opts, struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); int newfd = hold_locked_index(lock_file, 1); - if (read_cache() < 0) + if (read_cache_preload(NULL) < 0) return error("corrupt index file"); if (opts->force) { diff --git a/diff-lib.c b/diff-lib.c index a310fb2ad0..0aba6cda3c 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -214,7 +214,7 @@ static int get_stat_data(struct cache_entry *ce, const unsigned char *sha1 = ce->sha1; unsigned int mode = ce->ce_mode; - if (!cached) { + if (!cached && !ce_uptodate(ce)) { int changed; struct stat st; changed = check_removed(ce, &st); |