From 8837d33595b78dc4a52038856bc9a5c3f4b2ff50 Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Sun, 10 Oct 2010 19:24:06 +0200 Subject: [PATCH] diff --check: correct line numbers of new blank lines at EOF The whitespace check printed the value of the wrong variable, i.e. the beginning of the block of blank lines at the EOF (possibly absent) in the old file. As "git diff --check" is used by users to check their changes before making a commit, we should point at the line number in the file after the change. Signed-off-by: Christoph Mallon Signed-off-by: Junio C Hamano --- diff.c | 2 +- t/t4019-diff-wserror.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/diff.c b/diff.c index a2d8c7f9a7..38ba98932f 100644 --- a/diff.c +++ b/diff.c @@ -1888,7 +1888,7 @@ static void builtin_checkdiff(const char *name_a, const char *name_b, ecbdata.ws_rule = data.ws_rule; check_blank_at_eof(&mf1, &mf2, &ecbdata); - blank_at_eof = ecbdata.blank_at_eof_in_preimage; + blank_at_eof = ecbdata.blank_at_eof_in_postimage; if (blank_at_eof) { static char *err; diff --git a/t/t4019-diff-wserror.sh b/t/t4019-diff-wserror.sh index f6d1f1ebab..87df0aeb59 100755 --- a/t/t4019-diff-wserror.sh +++ b/t/t4019-diff-wserror.sh @@ -178,6 +178,15 @@ test_expect_success 'trailing empty lines (2)' ' ' +test_expect_success 'checkdiff shows correct line number for trailing blank lines' ' + + printf "a\nb\n" > G && + git add G && + printf "x\nx\nx\na\nb\nc\n\n" > G && + [ "$(git diff --check -- G)" = "G:7: new blank line at EOF." ] + +' + test_expect_success 'do not color trailing cr in context' ' git config --unset core.whitespace rm -f .gitattributes && -- 2.11.4.GIT