diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-09-14 22:05:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-14 22:18:36 -0700 |
| commit | d68fe26f3e03b230ac9bbbcf002a9acdc4bebde9 (patch) | |
| tree | 7827947bd8327faee689ecf1f6497cad9f08121d /t/t4019-diff-wserror.sh | |
| parent | aeb84b05ae448596c336807631d9633492b3049a (diff) | |
| download | git-d68fe26f3e03b230ac9bbbcf002a9acdc4bebde9.tar.gz | |
diff --whitespace: fix blank lines at end
The earlier logic tried to colour any and all blank lines that were added
beyond the last blank line in the original, but this was very wrong. If
you added 96 blank lines, a non-blank line, and then 3 blank lines at the
end, only the last 3 lines should trigger the error, not the earlier 96
blank lines.
We need to also make sure that the lines are after the last non-blank line
in the postimage as well before deciding to paint them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4019-diff-wserror.sh')
| -rwxr-xr-x | t/t4019-diff-wserror.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4019-diff-wserror.sh b/t/t4019-diff-wserror.sh index 1e75f1a110..3a3663fbcb 100755 --- a/t/t4019-diff-wserror.sh +++ b/t/t4019-diff-wserror.sh @@ -193,7 +193,7 @@ test_expect_success 'do not color trailing cr in context' ' test_expect_success 'color new trailing blank lines' ' { echo a; echo b; echo; echo; } >x && git add x && - { echo a; echo; echo; echo; echo; } >x && + { echo a; echo; echo; echo; echo c; echo; echo; echo; echo; } >x && git diff --color x >output && cnt=$(grep "${blue_grep}" output | wc -l) && test $cnt = 2 |