From: Christian Couder Date: Sat, 17 May 2014 12:16:34 GMT Subject: [PATCH v3 05/10] replace: make sure --edit results in a different object Message-ID: <20140517121640.27582.3418.chriscool@tuxfamily.org> 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 --- 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