cherry-pick/revert: add --skip option

diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 2385a60f680e4539930837d404ddfa598d2c6d4c..e7e64e085ddcfe7d7cf4df844472a6bf456ab079 100755 (executable)
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -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 &&