When object is replaced with itself git shows unhelpful messages like(git log):
"fatal: replace depth too high for object <SHA1>"
Prevents user from replacing object with itself(with test for checking
this case).
Signed-off-by: Manzur Mukhitdinov <[email protected]>
---
builtin/replace.c | 3 +++
t/t6050-replace.sh | 6 ++++++
2 files changed, 9 insertions(+)
diff --git a/builtin/replace.c b/builtin/replace.c
index 294b61b..b7e05ad 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -186,6 +186,9 @@ static int replace_object(const char *object_ref, const
char *replace_ref, int f
if (get_sha1(replace_ref, repl))
die("Failed to resolve '%s' as a valid ref.", replace_ref);
+ if (!hashcmp(object, repl))
+ return error("new object is the same as the old one: '%s'",
sha1_to_hex(object));
+
return replace_object_sha1(object_ref, object, replace_ref, repl,
force);
}
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 4d5a25e..f2b0307 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -440,4 +440,10 @@ test_expect_success GPG '--graft on a commit with a
mergetag' '
git replace -d $HASH10
'
+test_expect_success 'replacing object with itself must fail' '
+ test_must_fail git replace $HASH1 $HASH1 &&
+ HASH8=$(git rev-parse --verify HEAD) &&
+ test_must_fail git replace HEAD $HASH8
+'
+
test_done
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
