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

[PATCH v4 06/11] replace: bypass the type check if -f option is used

From
Christian Couder <chriscool@tuxfamily.org>
Date
Sep 3, 2013, 07:10 UTC
Message-ID
<20130903071026.29838.76437.chriscool@tuxfamily.org>
In-Reply-To
<20130903070551.29838.43576.chriscool@tuxfamily.org>

If -f option, which means '--force', is used, we can allow an object to be replaced with one of a different type, as the user should know what (s)he is doing.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 builtin/replace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/replace.c b/builtin/replace.c
index 9a94769..95736d9 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -103,7 +103,7 @@ static int replace_object(const char *object_ref, const char *replace_ref,
 
 	obj_type = sha1_object_info(object, NULL);
 	repl_type = sha1_object_info(repl, NULL);
-	if (obj_type != repl_type)
+	if (!force && obj_type != repl_type)
 		die("Objects must be of the same type.\n"
 		    "'%s' points to a replaced object of type '%s'\n"
 		    "while '%s' points to a replacement object of type '%s'.",

-- 
1.8.4.rc1.31.g530f5ce.dirty
Previous: Christian CouderNext: Junio C Hamano
Message 9 of 20 in “Check replacement object type and minor updates”
  1. 00/11 Check replacement object type and minor updatesChristian Couder, Sep 3, 2013
  2. 01/11 replace: forbid replacing an object with one of a different typeChristian Couder, Sep 3, 2013
  3. 02/11 Documentation/replace: state that objects must be of the same typeChristian Couder, Sep 3, 2013
  4. 03/11 t6050-replace: test that objects are of the same typeChristian Couder, Sep 3, 2013
  5. Junio C HamanoSep 4, 2013
  6. Christian CouderSep 5, 2013
  7. 04/11 t6050-replace: add test to clean up all the replace refsChristian Couder, Sep 3, 2013
  8. 05/11 Documentation/replace: add Creating Replacement Objects sectionChristian Couder, Sep 3, 2013
  9. 06/11 replace: bypass the type check if -f option is usedChristian Couder, Sep 3, 2013
  10. Junio C HamanoSep 4, 2013
  11. Christian CouderSep 5, 2013
  12. 07/11 Documentation/replace: tell that -f option bypasses the type checkChristian Couder, Sep 3, 2013
  13. Junio C HamanoSep 4, 2013
  14. Junio C HamanoSep 4, 2013
  15. 08/11 t6050-replace: check that -f option bypasses the type checkChristian Couder, Sep 3, 2013
  16. 09/11 replace: allow long option namesChristian Couder, Sep 3, 2013
  17. 10/11 Documentation/replace: list long option namesChristian Couder, Sep 3, 2013
  18. Junio C HamanoSep 4, 2013
  19. Christian CouderSep 5, 2013
  20. 11/11 t6050-replace: use some long option namesChristian Couder, Sep 3, 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.