git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCHv3 1/2] git-patch-id: test for "no newline" markers

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Feb 18, 2011, 10:12 UTC
Message-ID
<26bc8a07f1b965a3022c3a1542f95422a8462e42.1298023827.git.git@drmicha.warpmail.net>
In-Reply-To
<4D5E278F.2010509@drmicha.warpmail.net>

Currently, patch-id trips over the 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
Previous: Michael J GruberNext: Michael J Gruber
Message 12 of 18 in “Why does git-patch-id(1) sometimes print two lines, one of which has commit = 0000000000000000000000000000000000000000”
  1. Ævar Arnfjörð BjarmasonFeb 16, 2011
  2. Michael J GruberFeb 16, 2011
  3. 1/2 git-patch-id: test for "no newline" markersMichael J Gruber, Feb 16, 2011
  4. 2/2 git-patch-id: do not trip over "no newline" markersMichael J Gruber, Feb 16, 2011
  5. Junio C HamanoFeb 16, 2011
  6. 1/2 git-patch-id: test for "no newline" markersMichael J Gruber, Feb 17, 2011
  7. Jakub NarebskiFeb 17, 2011
  8. Michael J GruberFeb 17, 2011
  9. 2/2 git-patch-id: do not trip over "no newline" markersMichael J Gruber, Feb 17, 2011
  10. Jeff KingFeb 18, 2011
  11. Michael J GruberFeb 18, 2011
  12. 1/2 git-patch-id: test for "no newline" markersMichael J Gruber, Feb 18, 2011
  13. 2/2 git-patch-id: do not trip over "no newline" markersMichael J Gruber, Feb 18, 2011
  14. Jeff KingFeb 18, 2011
  15. Michael J GruberFeb 18, 2011
  16. Jeff KingFeb 18, 2011
  17. Jakub NarebskiFeb 18, 2011
  18. Jeff KingFeb 18, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.