diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-21 10:16:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-21 12:43:10 -0700 |
| commit | ccdc4ec3044bd108ae1e20d772f078c10df114b3 (patch) | |
| tree | 54b78634ed72b83854ff5d9564a76ec6020e7d73 /builtin/diff.c | |
| parent | 87b50542a08ac6caa083ddc376e674424e37940a (diff) | |
| download | git-ccdc4ec3044bd108ae1e20d772f078c10df114b3.tar.gz | |
diff/status: refactor opportunistic index update
When we had to refresh the index internally before running diff or status,
we opportunistically updated the $GIT_INDEX_FILE so that later invocation
of git can use the lstat(2) we already did in this invocation.
Make them share a helper function to do so.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index a43d326363..bab4bd9f57 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -197,12 +197,7 @@ static void refresh_index_quietly(void) discard_cache(); read_cache(); refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED); - - if (active_cache_changed && - !write_cache(fd, active_cache, active_nr)) - commit_locked_index(lock_file); - - rollback_lock_file(lock_file); + update_index_if_able(&the_index, lock_file); } static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv) |