summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2011-02-17 07:44:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-17 19:56:50 (GMT)
commit2485eab55cc0dcab34311ecd0ac52038aa9d9db4 (patch)
tree54117a9f94e1cc0c8d2f3dbbd90bc79fd9dd5d7e /t
parentf2b5e7af10a2d51ce300a958c32d26ec0cf6f678 (diff)
downloadgit-2485eab55cc0dcab34311ecd0ac52038aa9d9db4.zip
git-2485eab55cc0dcab34311ecd0ac52038aa9d9db4.tar.gz
git-2485eab55cc0dcab34311ecd0ac52038aa9d9db4.tar.bz2
git-patch-id: do not trip over "no newline" markers
Currently, patch-id trips over our very own diff extension for marking the absence of newline at EOF. Fix it. (Ignore it, it's whitespace.) Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t4204-patch-id.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index db96064..d2c930d 100755
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
@@ -94,7 +94,7 @@ index e69de29..6178079 100644
+b
EOF
-test_expect_failure 'patch-id handles no-nl-at-eof markers' '
+test_expect_success 'patch-id handles no-nl-at-eof markers' '
cat nonl | calc_patch_id nonl &&
cat withnl | calc_patch_id withnl &&
test_cmp patch-id_nonl patch-id_withnl