diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-06-26 15:36:59 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-06-26 22:07:26 -0700 |
commit | 877f23ccb88227203f2576abdfb5d1c15925fcb3 (patch) | |
tree | 6d54619f825b9e489f90928f9f7af670cc0a4cb8 /t/t4015-diff-whitespace.sh | |
parent | 1ba111d1d6bd90b2c120ceb05418e01ee304cc46 (diff) | |
download | git-877f23ccb88227203f2576abdfb5d1c15925fcb3.tar.gz |
Teach "diff --check" about new blank lines at end
When a patch adds new blank lines at the end, "git apply --whitespace"
warns. This teaches "diff --check" to do the same.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4015-diff-whitespace.sh')
-rwxr-xr-x | t/t4015-diff-whitespace.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index b7cc6b28e6..0922c708f1 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -335,4 +335,10 @@ test_expect_success 'line numbers in --check output are correct' ' ' +test_expect_success 'checkdiff detects trailing blank lines' ' + echo "foo();" >x && + echo "" >>x && + git diff --check | grep "ends with blank" +' + test_done |