diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-27 19:24:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-27 19:24:13 -0800 |
| commit | 2af9664776a237baa7ce67789bc5d2b54a36d95c (patch) | |
| tree | 7175a6e86b9f6dc1448dd2527d66f64a2e30c3ab /builtin-diff-files.c | |
| parent | 98cdf78c5cf1356757ccc4d25c212ae1f38339e4 (diff) | |
| parent | 7c4ea599b0d44e46c4f96bf955b62d96126b53ff (diff) | |
| download | git-2af9664776a237baa7ce67789bc5d2b54a36d95c.tar.gz | |
Merge branch 'lt/preload-lstat'
* lt/preload-lstat:
Fix index preloading for racy dirty case
Add cache preload facility
Diffstat (limited to 'builtin-diff-files.c')
| -rw-r--r-- | builtin-diff-files.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-diff-files.c b/builtin-diff-files.c index 2b578c714d..5b64011de8 100644 --- a/builtin-diff-files.c +++ b/builtin-diff-files.c @@ -59,8 +59,8 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) (rev.diffopt.output_format & DIFF_FORMAT_PATCH)) rev.combine_merges = rev.dense_combined_merges = 1; - if (read_cache() < 0) { - perror("read_cache"); + if (read_cache_preload(rev.diffopt.paths) < 0) { + perror("read_cache_preload"); return -1; } result = run_diff_files(&rev, options); |