Commit f22166b5 authored by Christian Couder's avatar Christian Couder Committed by Junio C Hamano

replace: make sure --edit results in a different object

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's avatarChristian Couder <chriscool@tuxfamily.org>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent b892bb45
......@@ -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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment