Fix per-directory exclude handing for "git add"

[git.git] / builtin-diff.c

diff --git a/builtin-diff.c b/builtin-diff.c
index 6ed7b6842ec533902427f2d47790d57aa5082365..f557d21929fe3df018f30e68c7943ead7f8eb4a1 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -188,6 +188,26 @@ void add_head(struct rev_info *revs)
        add_pending_object(revs, obj, "HEAD");
 }
 
+static void refresh_index_quietly(void)
+{
+       struct lock_file *lock_file;
+       int fd;
+
+       lock_file = xcalloc(1, sizeof(struct lock_file));
+       fd = hold_locked_index(lock_file, 0);
+       if (fd < 0)
+               return;
+       discard_cache();
+       read_cache();
+       refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED);
+
+       if (active_cache_changed &&
+           !write_cache(fd, active_cache, active_nr) && !close(fd))
+               commit_locked_index(lock_file);
+
+       rollback_lock_file(lock_file);
+}
+
 int cmd_diff(int argc, const char **argv, const char *prefix)
 {
        int i;
@@ -222,7 +242,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
        prefix = setup_git_directory_gently(&nongit);
        git_config(git_diff_ui_config);
        init_revisions(&rev, prefix);
-       rev.diffopt.skip_stat_unmatch = 1;
+       rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
 
        if (!setup_diff_no_index(&rev, argc, argv, nongit, prefix))
                argc = 0;
@@ -346,11 +366,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
        if (rev.diffopt.exit_with_status)
                result = rev.diffopt.has_changes;
 
-       if ((rev.diffopt.output_format & DIFF_FORMAT_PATCH)
-           && (1 < rev.diffopt.skip_stat_unmatch))
-               printf("Warning: %d path%s touched but unmodified. "
-                      "Consider running git-status.\n",
-                      rev.diffopt.skip_stat_unmatch - 1,
-                      rev.diffopt.skip_stat_unmatch == 2 ? "" : "s");
+       if (1 < rev.diffopt.skip_stat_unmatch)
+               refresh_index_quietly();
        return result;
 }