Make "diff --check" output match "git apply"

For consistency, make the two tools report whitespace errors in the
same way (the output of "diff --check" has been tweaked to match
that of "git apply").

Note that although the textual content is basically the same only
"git diff --check" provides a colorized version of the problematic
lines; making "git apply" do colorization will require more extensive
changes (figuring out the diff colorization preferences of the user)
and so that will be a subject for another commit.

Signed-off-by: Wincent Colaiuta <win@wincent.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-apply.c b/builtin-apply.c
index ab393f32e9740c00b5e8fb40076516de7924c16f..2edd83bf40f51f52e58737ef5e7220ae70afb6e1 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -912,8 +912,8 @@ static void check_whitespace(const char *line, int len, unsigned ws_rule)
                ;
        else {
                err = whitespace_error_string(result);
                ;
        else {
                err = whitespace_error_string(result);

-               fprintf(stderr, "%s.\n%s:%d:%.*s\n",
-                    err, patch_input_file, linenr, len - 2, line + 1);
+               fprintf(stderr, "%s:%d: %s.\n%.*s\n",
+                    patch_input_file, linenr, err, len - 2, line + 1);

                free(err);
        }
 }
                free(err);
        }
 }

diff --git a/diff.c b/diff.c
index 577c773c3e9919015a15563669ed0e6f73fb9d3f..08ec66c7945fb330d289f9e579a162e9217a16eb 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -973,8 +973,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
                if (!data->status)
                        return;
                err = whitespace_error_string(data->status);
                if (!data->status)
                        return;
                err = whitespace_error_string(data->status);

-               printf("%s:%d: %s%s:%s ", data->filename, data->lineno,
-                   ws, err, reset);
+               printf("%s:%d: %s.\n", data->filename, data->lineno, err);

                free(err);
                emit_line(set, reset, line, 1);
                (void)check_and_emit_line(line + 1, len - 1, data->ws_rule,
                free(err);
                emit_line(set, reset, line, 1);
                (void)check_and_emit_line(line + 1, len - 1, data->ws_rule,