path: root/t/
diff options
authorChristian Couder <>2019-03-31 13:46:59 (GMT)
committerJunio C Hamano <>2019-04-15 02:33:23 (GMT)
commitee521ec4cb09981c14ec32aca370b5ff5d15c4d9 (patch)
tree350acd939bf600d224148377972fcb98200c57ef /t/
parentf8e44a81bf82ae35e37500f9597e93b0bdfc05e4 (diff)
replace: peel tag when passing a tag first to --graft
When passing a tag as the first argument to `git replace --graft`, it can be useful to accept it and use the underlying commit as a the commit that will be replaced. This already works for lightweight tags, but unfortunately for annotated tags we have been using the hash of the tag object instead of the hash of the underlying commit. Especially we would pass the hash of the tag object to replace_object_oid() where we would likely fail with an error like: "error: Objects must be of the same type. 'annotated_replaced_object' points to a replaced object of type 'tag' while 'replacement' points to a replacement object of type 'commit'." This patch fixes that by using the hash of the underlying commit when an annotated tag is passed. Signed-off-by: Christian Couder <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/')
1 files changed, 11 insertions, 0 deletions
diff --git a/t/ b/t/
index 2385a60..e7e64e0 100755
--- a/t/
+++ b/t/
@@ -417,6 +417,17 @@ test_expect_success '--graft using a tag as the new parent' '
git replace -d $HASH7
+test_expect_success '--graft using a tag as the replaced object' '
+ git tag replaced_object $HASH7 &&
+ git replace --graft replaced_object $HASH5 &&
+ commit_has_parents $HASH7 $HASH5 &&
+ git replace -d $HASH7 &&
+ git tag -a -m "annotated replaced object tag" annotated_replaced_object $HASH7 &&
+ git replace --graft annotated_replaced_object $HASH5 &&
+ commit_has_parents $HASH7 $HASH5 &&
+ git replace -d $HASH7
test_expect_success GPG 'set up a signed commit' '
echo "line 17" >>hello &&
echo "line 18" >>hello &&