summaryrefslogtreecommitdiff
path: root/builtin-diff.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin-diff.c')
-rw-r--r--builtin-diff.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/builtin-diff.c b/builtin-diff.c
index 8dc17b0..6ed7b68 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -222,6 +222,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;
if (!setup_diff_no_index(&rev, argc, argv, nongit, prefix))
argc = 0;
@@ -344,5 +345,12 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
ent, ents);
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");
return result;
}