зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
7ed863a85a
Коммит
f2b5e7af10
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче