path: root/t/
diff options
authorChristian Couder <>2019-03-31 13:46:58 (GMT)
committerJunio C Hamano <>2019-04-15 02:31:42 (GMT)
commitf8e44a81bf82ae35e37500f9597e93b0bdfc05e4 (patch)
tree0c504d4c8f098c802acd5ab6bbd5f004be74d9f8 /t/
parent587617016744448ace200804aed9edccb436f38e (diff)
replace: peel tag when passing a tag as parent to --graft
When passing a tag as a parent argument to `git replace --graft`, it can be useful to accept it and use the underlying commit as a parent. 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 as a parent in the replacement object we create. This created invalid objects, but the replace succeeded even if it showed an error like: error: object A is a tag, not a commit This patch fixes that by using the hash of the underlying commit when an annotated tag is passed. While at it, let's also update an error message to make it clearer. Reviewed-by: Taylor Blau <> 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 948d278..2385a60 100755
--- a/t/
+++ b/t/
@@ -406,6 +406,17 @@ test_expect_success '--graft with and without already replaced object' '
git replace -d $HASH5
+test_expect_success '--graft using a tag as the new parent' '
+ git tag new_parent $HASH5 &&
+ git replace --graft $HASH7 new_parent &&
+ commit_has_parents $HASH7 $HASH5 &&
+ git replace -d $HASH7 &&
+ git tag -a -m "annotated new parent tag" annotated_new_parent $HASH5 &&
+ git replace --graft $HASH7 annotated_new_parent &&
+ 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 &&