[PATCH v3 06/11] replace: bypass the type check if -f option is used
From: Christian Couder <hidden>
Date: 2016-06-15 22:58:35
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- 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