[PATCHv2 1/2] git-patch-id: test for "no newline" markers
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Feb 17, 2011, 07:44 UTC
- Message-ID
- <d27aa07556df763b34b980d3706320216094d592.1297928549.git.git@drmicha.warpmail.net>
- In-Reply-To
- <7vwrkziw2i.fsf@alter.siamese.dyndns.org>
Currently, patch-id trips over our very own diff extension for marking the absence of newline at EOF.
Expose this in a test.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- 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 68e2652..db96064 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
-- 1.7.4.1.74.gf39475.dirty