From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Philip Oakley <philipoakley@iee.org>,
Thomas Rast <trast@inf.ethz.ch>, Johannes Sixt <j6t@kdbg.org>,
Eric Sunshine <sunshine@sunshineco.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v4 06/11] replace: bypass the type check if -f option is used
Date: Tue, 03 Sep 2013 09:10:20 +0200 [thread overview]
Message-ID: <20130903071026.29838.76437.chriscool@tuxfamily.org> (raw)
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
next prev parent reply other threads:[~2013-09-03 7:17 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-03 7:10 [PATCH v4 00/11] Check replacement object type and minor updates Christian Couder
2013-09-03 7:10 ` [PATCH v4 01/11] replace: forbid replacing an object with one of a different type Christian Couder
2013-09-03 7:10 ` [PATCH v4 02/11] Documentation/replace: state that objects must be of the same type Christian Couder
2013-09-03 7:10 ` [PATCH v4 03/11] t6050-replace: test that objects are " Christian Couder
2013-09-04 20:39 ` Junio C Hamano
2013-09-05 19:13 ` Christian Couder
2013-09-03 7:10 ` [PATCH v4 04/11] t6050-replace: add test to clean up all the replace refs Christian Couder
2013-09-03 7:10 ` [PATCH v4 05/11] Documentation/replace: add Creating Replacement Objects section Christian Couder
2013-09-03 7:10 ` Christian Couder [this message]
2013-09-04 20:44 ` [PATCH v4 06/11] replace: bypass the type check if -f option is used Junio C Hamano
2013-09-05 12:56 ` Christian Couder
2013-09-03 7:10 ` [PATCH v4 07/11] Documentation/replace: tell that -f option bypasses the type check Christian Couder
2013-09-04 20:45 ` Junio C Hamano
2013-09-04 20:48 ` Junio C Hamano
2013-09-03 7:10 ` [PATCH v4 08/11] t6050-replace: check " Christian Couder
2013-09-03 7:10 ` [PATCH v4 09/11] replace: allow long option names Christian Couder
2013-09-03 7:10 ` [PATCH v4 10/11] Documentation/replace: list " Christian Couder
2013-09-04 20:45 ` Junio C Hamano
2013-09-05 13:03 ` Christian Couder
2013-09-03 7:10 ` [PATCH v4 11/11] t6050-replace: use some " Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130903071026.29838.76437.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=philipoakley@iee.org \
--cc=sunshine@sunshineco.com \
--cc=trast@inf.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).