diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-06-02 19:55:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-06-02 20:02:19 -0700 |
| commit | c94bf41c9a78dc1c084f2a2895f95b6b6d8f79b1 (patch) | |
| tree | f5040d5a1f56a9479f0277158a2648df9e63a272 | |
| parent | d3017e9373d1fea0558c77de7297648667e3a713 (diff) | |
| download | git-c94bf41c9a78dc1c084f2a2895f95b6b6d8f79b1.tar.gz git-c94bf41c9a78dc1c084f2a2895f95b6b6d8f79b1.tar.xz | |
git-apply: what is detected and fixed is not just trailing spaces.
But we kept saying "trailing whitespace" all the same. Reword the
error messages a bit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-apply.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index e71789803..c6f736c14 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -55,7 +55,7 @@ static enum whitespace_eol { } new_whitespace = warn_on_whitespace; static int whitespace_error; static int squelch_whitespace_errors = 5; -static int applied_after_stripping; +static int applied_after_fixing_ws; static const char *patch_input_file; static void parse_whitespace_option(const char *option) @@ -1657,7 +1657,7 @@ static int apply_line(char *output, const char *patch, int plen) if (add_nl_to_tail) output[plen++] = '\n'; if (fixed) - applied_after_stripping++; + applied_after_fixing_ws++; return output + plen - buf; } @@ -2884,18 +2884,17 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix) squelched == 1 ? "" : "s"); } if (new_whitespace == error_on_whitespace) - die("%d line%s add%s trailing whitespaces.", + die("%d line%s add%s whitespace errors.", whitespace_error, whitespace_error == 1 ? "" : "s", whitespace_error == 1 ? "s" : ""); - if (applied_after_stripping) + if (applied_after_fixing_ws) fprintf(stderr, "warning: %d line%s applied after" - " stripping trailing whitespaces.\n", - applied_after_stripping, - applied_after_stripping == 1 ? "" : "s"); + " fixing whitespace errors.\n", + applied_after_fixing_ws, + applied_after_fixing_ws == 1 ? "" : "s"); else if (whitespace_error) - fprintf(stderr, "warning: %d line%s add%s trailing" - " whitespaces.\n", + fprintf(stderr, "warning: %d line%s add%s whitespace errors.\n", whitespace_error, whitespace_error == 1 ? "" : "s", whitespace_error == 1 ? "s" : ""); |