aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-01-08 15:46:18 -0800
committerJunio C Hamano <gitster@pobox.com>2008-01-08 16:15:01 -0800
commitd8c3794503553c22330f46ed4c0e70a6613d2f65 (patch)
tree79b447ab571c744c5f94dd1de067f31014c96715
parente708af6e587ae0ecb2a6480e3614c5ec4a164106 (diff)
downloadgit-d8c3794503553c22330f46ed4c0e70a6613d2f65.tar.gz
git-d8c3794503553c22330f46ed4c0e70a6613d2f65.tar.xz
"git-apply --check" should not report "fixed"
When running "git apply --check" while --whitespace=fix is enabled (either from the command line or via the configuration), we reported that "N line(s) applied after _fixing_", but --check by itself does not apply and this message was alarming. We could even reword the message to say "N line(s) would have been applied after fixing...", but this patch does not go that far. Instead, we just make it use the "N lines add whitespace errors" warning, which happens to be a good diagnostic message a user would expect from the --check option. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index 5e3b4a144..d57bb6e07 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2907,7 +2907,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
whitespace_error,
whitespace_error == 1 ? "" : "s",
whitespace_error == 1 ? "s" : "");
- if (applied_after_fixing_ws)
+ if (applied_after_fixing_ws && apply)
fprintf(stderr, "warning: %d line%s applied after"
" fixing whitespace errors.\n",
applied_after_fixing_ws,