From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: [PATCH v3 05/10] replace: make sure --edit results in a different object
Date: Sat, 17 May 2014 14:16:34 +0200 [thread overview]
Message-ID: <20140517121640.27582.3418.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140517120649.27582.58609.chriscool@tuxfamily.org>
It's a bad idea to create a replace ref for an object
that points to the original object itself.
That's why we have to check if the result from editing
the original object is a different object and error out
if it isn't.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/replace.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/builtin/replace.c b/builtin/replace.c
index 3da1bae..0751804 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -275,6 +275,9 @@ static int edit_and_replace(const char *object_ref, int force)
free(tmpfile);
+ if (!hashcmp(old, new))
+ return error("new object is the same as the old one: '%s'", sha1_to_hex(old));
+
return replace_object_sha1(object_ref, old, "replacement", new, force);
}
--
1.9.rc0.17.g651113e
next prev parent reply other threads:[~2014-05-17 15:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-17 12:16 [PATCH v3 00/10] replace: add option to edit a Git object Christian Couder
2014-05-17 12:16 ` [PATCH v3 01/10] replace: refactor command-mode determination Christian Couder
2014-05-17 12:16 ` [PATCH v3 02/10] replace: use OPT_CMDMODE to handle modes Christian Couder
2014-05-17 12:16 ` [PATCH v3 03/10] replace: factor object resolution out of replace_object Christian Couder
2014-05-17 12:16 ` [PATCH v3 04/10] replace: add --edit option Christian Couder
2014-05-17 12:16 ` Christian Couder [this message]
2014-05-17 12:16 ` [PATCH v3 06/10] replace: refactor checking ref validity Christian Couder
2014-05-17 12:16 ` [PATCH v3 07/10] replace: die early if replace ref already exists Christian Couder
2014-05-17 12:16 ` [PATCH v3 08/10] replace: add tests for --edit Christian Couder
2014-05-17 12:16 ` [PATCH v3 09/10] replace: add --edit to usage string Christian Couder
2014-05-17 12:16 ` [PATCH v3 10/10] Documentation: replace: describe new --edit option Christian Couder
2014-05-19 20:39 ` [PATCH v3 00/10] replace: add option to edit a Git object Junio C Hamano
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=20140517121640.27582.3418.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).