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 v2 07/10] replace: die early if replace ref already exists
Date: Sat, 17 May 2014 08:41:29 +0200 [thread overview]
Message-ID: <20140517064133.18932.92343.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20140517062418.18932.21200.chriscool@tuxfamily.org>
If a replace ref already exists for an object, it is
much better for the user if we error out before we
let the user edit the object, rather than after.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/replace.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/builtin/replace.c b/builtin/replace.c
index 3d6edaf..4ee3d92 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -268,7 +268,8 @@ static int edit_and_replace(const char *object_ref, int force)
{
char *tmpfile = git_pathdup("REPLACE_EDITOBJ");
enum object_type type;
- unsigned char old[20], new[20];
+ unsigned char old[20], new[20], prev[20];
+ char ref[PATH_MAX];
if (get_sha1(object_ref, old) < 0)
die("Not a valid object name: '%s'", object_ref);
@@ -277,6 +278,8 @@ static int edit_and_replace(const char *object_ref, int force)
if (type < 0)
die("unable to get object type for %s", sha1_to_hex(old));
+ check_ref_valid(old, prev, ref, sizeof(ref), force);
+
export_object(old, tmpfile);
if (launch_editor(tmpfile, NULL, NULL) < 0)
die("editing object file failed");
--
1.9.rc0.17.g651113e
next prev parent reply other threads:[~2014-05-17 6:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-17 6:41 [PATCH v2 00/10] replace: add option to edit a Git object Christian Couder
2014-05-17 6:41 ` [PATCH v2 01/10] replace: refactor command-mode determination Christian Couder
2014-05-17 6:41 ` [PATCH v2 02/10] replace: use OPT_CMDMODE to handle modes Christian Couder
2014-05-17 6:41 ` [PATCH v2 03/10] replace: factor object resolution out of replace_object Christian Couder
2014-05-17 6:41 ` [PATCH v2 04/10] replace: add --edit option Christian Couder
2014-05-17 6:41 ` [PATCH v2 05/10] replace: make sure --edit results in a different object Christian Couder
2014-05-17 7:03 ` Jeff King
2014-05-17 6:41 ` [PATCH v2 06/10] replace: refactor checking ref validity Christian Couder
2014-05-17 6:41 ` Christian Couder [this message]
2014-05-17 7:05 ` [PATCH v2 07/10] replace: die early if replace ref already exists Jeff King
2014-05-17 6:41 ` [PATCH v2 08/10] replace: add tests for --edit Christian Couder
2014-05-17 7:14 ` Jeff King
2014-05-17 6:41 ` [PATCH v2 09/10] replace: add --edit to usage string Christian Couder
2014-05-17 6:41 ` [PATCH v2 10/10] Documentation: replace: describe new --edit option Christian Couder
2014-05-17 7:23 ` Jeff King
2014-05-17 7:24 ` [PATCH v2 00/10] replace: add option to edit a Git object Jeff King
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=20140517064133.18932.92343.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).