From ccdc4ec3044bd108ae1e20d772f078c10df114b3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 21 Mar 2011 10:16:10 -0700 Subject: 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 --- builtin/diff.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'builtin/diff.c') diff --git a/builtin/diff.c b/builtin/diff.c index a43d32636..bab4bd9f5 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) -- cgit v1.2.1