Merge branch 'jc/index-update-if-able'

[git.git] / builtin / diff.c

diff --git a/builtin/diff.c b/builtin/diff.c
index 4c9deb28ec15d0c2adae795cc2c177b24256e585..655a013ed05edd369225aa9ee9f39f347d687172 100644 (file)
--- 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)