diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:30 -0800 |
| commit | c8cdbf2badcc500ec68c506a3b4bda9b1e18995f (patch) | |
| tree | 319dadc562b6b4b8a607ec262f07fed482ce9acc /t/t4204-patch-id.sh | |
| parent | Merge branch 'mz/rerere-remaining' (diff) | |
| parent | git-patch-id: do not trip over "no newline" markers (diff) | |
| download | tgif-c8cdbf2badcc500ec68c506a3b4bda9b1e18995f.tar.xz | |
Merge branch 'mg/patch-id'
* mg/patch-id:
git-patch-id: do not trip over "no newline" markers
git-patch-id: test for "no newline" markers
Diffstat (limited to 't/t4204-patch-id.sh')
| -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..d2c930de87 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_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 +' test_done |