diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:32:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-20 10:32:10 -0800 |
| commit | 10022a6d02f10afada7990f232d184a7ebe82b90 (patch) | |
| tree | d976802bd99cda8d9c6c59142c7ff644e0db69e8 /builtin/diff-index.c | |
| parent | a9bb4e55a3a552a705f8a6222e4523ed27bb7cc8 (diff) | |
| parent | 7349afd20e3b0ce3da6f192f593390472acec9d3 (diff) | |
Merge branch 'kb/preload-index-more'
Use preloadindex in more places, which has a nice speedup on systems
with slow stat calls (and even on Linux).
* kb/preload-index-more:
update-index/diff-index: use core.preloadindex to improve performance
Diffstat (limited to 'builtin/diff-index.c')
| -rw-r--r-- | builtin/diff-index.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/diff-index.c b/builtin/diff-index.c index 2eb32bd9da..1c737f7921 100644 --- a/builtin/diff-index.c +++ b/builtin/diff-index.c @@ -41,9 +41,13 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) if (rev.pending.nr != 1 || rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1) usage(diff_cache_usage); - if (!cached) + if (!cached) { setup_work_tree(); - if (read_cache() < 0) { + if (read_cache_preload(rev.diffopt.pathspec.raw) < 0) { + perror("read_cache_preload"); + return -1; + } + } else if (read_cache() < 0) { perror("read_cache"); return -1; } |
