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

[PATCH v5 7/7] replace: add test for --graft with signed commit

From
Christian Couder <chriscool@tuxfamily.org>
Date
Jun 28, 2014, 18:11 UTC
Message-ID
<20140628181117.5687.83337.chriscool@tuxfamily.org>
In-Reply-To
<20140628171731.5687.30308.chriscool@tuxfamily.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 t/t6050-replace.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index ca45a84..80b85e3 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -7,6 +7,7 @@ test_description='Tests replace refs functionality'
 exec </dev/null
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY/lib-gpg.sh"
 
 add_and_commit_file()
 {
@@ -363,4 +364,25 @@ test_expect_success '--graft with and without already replaced object' '
 	git replace -d $HASH5
 '
 
+test_expect_success GPG 'set up a signed commit' '
+	echo "line 17" >> hello &&
+	echo "line 18" >> hello &&
+	git add hello &&
+	test_tick &&
+	git commit --quiet -S -m "hello: 2 more lines in a signed commit" &&
+	HASH8=$(git rev-parse --verify HEAD) &&
+	git verify-commit $HASH8
+'
+
+test_expect_success GPG '--graft with a signed commit' '
+	git cat-file commit $HASH8 >orig &&
+	git replace --graft $HASH8 &&
+	git cat-file commit $HASH8 >repl &&
+	test_must_fail grep gpgsig repl &&
+	diff -u orig repl | grep "^-parent $HASH7" &&
+	diff -u orig repl | grep "^-gpgsig -----BEGIN PGP SIGNATURE-----" &&
+	test_must_fail git verify-commit $HASH8 &&
+	git replace -d $HASH8
+'
+
 test_done
-- 
2.0.0.421.g786a89d.dirty
Previous: Christian CouderNext: Junio C Hamano
Message 15 of 17 in “Add --graft option to git replace”
  1. 0/7 Add --graft option to git replaceChristian Couder, Jun 28, 2014
  2. 1/7 replace: add --graft optionChristian Couder, Jun 28, 2014
  3. 2/7 replace: add test for --graftChristian Couder, Jun 28, 2014
  4. Junio C HamanoJul 2, 2014
  5. Christian CouderJul 3, 2014
  6. Junio C HamanoJul 3, 2014
  7. 3/7 Documentation: replace: add --graft optionChristian Couder, Jun 28, 2014
  8. 4/7 contrib: add convert-grafts-to-replace-refs.shChristian Couder, Jun 28, 2014
  9. 5/7 replace: refactor replacing parentsChristian Couder, Jun 28, 2014
  10. Junio C HamanoJul 2, 2014
  11. Christian CouderJul 3, 2014
  12. 6/7 replace: remove signature when using --graftChristian Couder, Jun 28, 2014
  13. Junio C HamanoJul 2, 2014
  14. Christian CouderJul 3, 2014
  15. 7/7 replace: add test for --graft with signed commitChristian Couder, Jun 28, 2014
  16. Junio C HamanoJul 2, 2014
  17. Christian CouderJul 3, 2014

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.