diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2011-02-16 17:55:37 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-02-17 11:54:57 -0800 |
| commit | f2b5e7af10a2d51ce300a958c32d26ec0cf6f678 (patch) | |
| tree | da4014d4ee51f6e935662f6b1f7a052fa529e0e6 | |
| parent | Git 1.7.4 (diff) | |
| download | tgif-f2b5e7af10a2d51ce300a958c32d26ec0cf6f678.tar.xz | |
git-patch-id: test for "no newline" markers
Currently, patch-id trips over our very own output that marks the absence
of newline at EOF.
Expose this in a test.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t4204-patch-id.sh | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh index 68e2652814..db96064f67 100755 --- a/t/t4204-patch-id.sh +++ b/t/t4204-patch-id.sh @@ -63,4 +63,40 @@ test_expect_success 'patch-id supports git-format-patch MIME output' ' test_cmp patch-id_master patch-id_same ' +cat >nonl <<\EOF +diff --git i/a w/a +index e69de29..2e65efe 100644 +--- i/a ++++ w/a +@@ -0,0 +1 @@ ++a +\ No newline at end of file +diff --git i/b w/b +index e69de29..6178079 100644 +--- i/b ++++ w/b +@@ -0,0 +1 @@ ++b +EOF + +cat >withnl <<\EOF +diff --git i/a w/a +index e69de29..7898192 100644 +--- i/a ++++ w/a +@@ -0,0 +1 @@ ++a +diff --git i/b w/b +index e69de29..6178079 100644 +--- i/b ++++ w/b +@@ -0,0 +1 @@ ++b +EOF + +test_expect_failure '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 +' test_done |