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

[PATCH v4 2/4] replace: add test for --graft

From
Christian Couder <chriscool@tuxfamily.org>
Date
Jun 6, 2014, 20:25 UTC
Message-ID
<20140606202536.3722.42995.chriscool@tuxfamily.org>
In-Reply-To
<20140606201741.3722.96819.chriscool@tuxfamily.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 t/t6050-replace.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 68b3cb2..ca45a84 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -351,4 +351,16 @@ test_expect_success 'replace ref cleanup' '
 	test -z "$(git replace)"
 '
 
+test_expect_success '--graft with and without already replaced object' '
+	test $(git log --oneline | wc -l) = 7 &&
+	git replace --graft $HASH5 &&
+	test $(git log --oneline | wc -l) = 3 &&
+	git cat-file -p $HASH5 | test_must_fail grep parent &&
+	test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 &&
+	git replace --force -g $HASH5 $HASH4 $HASH3 &&
+	git cat-file -p $HASH5 | grep "parent $HASH4" &&
+	git cat-file -p $HASH5 | grep "parent $HASH3" &&
+	git replace -d $HASH5
+'
+
 test_done
-- 
2.0.0.rc0.40.gd30ccc4
Previous: Christian CouderNext: Christian Couder
Message 3 of 5 in “Add --graft option to git replace”
  1. 0/4 Add --graft option to git replaceChristian Couder, Jun 6, 2014
  2. 1/4 replace: add --graft optionChristian Couder, Jun 6, 2014
  3. 2/4 replace: add test for --graftChristian Couder, Jun 6, 2014
  4. 3/4 Documentation: replace: add --graft optionChristian Couder, Jun 6, 2014
  5. 4/4 contrib: add convert-grafts-to-replace-refs.shChristian Couder, Jun 6, 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.