From: Christian Couder Date: Sat, 17 May 2014 12:16:36 +0000 (+0200) Subject: replace: die early if replace ref already exists X-Git-Tag: v2.1.0-rc0~134^2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/24790835738dc098fa6becedc44aac0341b7d5af replace: die early if replace ref already exists 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/replace.c b/builtin/replace.c index 3d6edaf7c7..4ee3d929fa 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");