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

[PATCH v5 3/7] t6050-replace: test that objects are of the same type

From
Christian Couder <chriscool@tuxfamily.org>
Date
Sep 6, 2013, 05:10 UTC
Message-ID
<20130906051100.6657.75496.chriscool@tuxfamily.org>
In-Reply-To
<20130906050702.6657.25651.chriscool@tuxfamily.org>
and that the -f option bypasses the type check
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 t/t6050-replace.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index decdc33..09bad98 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -263,4 +263,17 @@ test_expect_success 'not just commits' '
 	test_cmp file.replaced file
 '
 
+test_expect_success 'replaced and replacement objects must be of the same type' '
+	test_must_fail git replace mytag $HASH1 &&
+	test_must_fail git replace HEAD^{tree} HEAD~1 &&
+	BLOB=$(git rev-parse :file) &&
+	test_must_fail git replace HEAD^ $BLOB
+'
+
+test_expect_success '-f option bypasses the type check' '
+	git replace -f mytag $HASH1 &&
+	git replace -f HEAD^{tree} HEAD~1 &&
+	git replace -f HEAD^ $BLOB
+'
+
 test_done
-- 
1.8.4.rc1.28.ge2684af
Previous: Christian CouderNext: Christian Couder
Message 6 of 10 in “Check replacement object type and minor updates”
  1. 0/7 Check replacement object type and minor updatesChristian Couder, Sep 6, 2013
  2. 1/7 replace: forbid replacing an object with one of a different typeChristian Couder, Sep 6, 2013
  3. Junio C HamanoSep 6, 2013
  4. Junio C HamanoSep 6, 2013
  5. 2/7 Documentation/replace: state that objects must be of the same typeChristian Couder, Sep 6, 2013
  6. 3/7 t6050-replace: test that objects are of the same typeChristian Couder, Sep 6, 2013
  7. 4/7 t6050-replace: add test to clean up all the replace refsChristian Couder, Sep 6, 2013
  8. 5/7 Documentation/replace: add Creating Replacement Objects sectionChristian Couder, Sep 6, 2013
  9. 6/7 replace: allow long option namesChristian Couder, Sep 6, 2013
  10. 7/7 t6050-replace: use some long option namesChristian Couder, Sep 6, 2013

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.