pretty: add %D format specifier

diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index fb07ad24259c3ee059097f4b4d84a68450b88ab3..4d5a25eedfef50c578d776990a8a3ac44064533f 100755 (executable)
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -7,8 +7,9 @@ test_description='Tests replace refs functionality'
 exec </dev/null
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY/lib-gpg.sh"
 
-add_and_commit_file()
+add_and_commit_file ()
 {
     _file="$1"
     _msg="$2"
@@ -18,6 +19,38 @@ add_and_commit_file()
     git commit --quiet -m "$_file: $_msg"
 }
 
+commit_buffer_contains_parents ()
+{
+    git cat-file commit "$1" >payload &&
+    sed -n -e '/^$/q' -e '/^parent /p' <payload >actual &&
+    shift &&
+    for _parent
+    do
+       echo "parent $_parent"
+    done >expected &&
+    test_cmp expected actual
+}
+
+commit_peeling_shows_parents ()
+{
+    _parent_number=1
+    _commit="$1"
+    shift &&
+    for _parent
+    do
+       _found=$(git rev-parse --verify $_commit^$_parent_number) || return 1
+       test "$_found" = "$_parent" || return 1
+       _parent_number=$(( $_parent_number + 1 ))
+    done &&
+    test_must_fail git rev-parse --verify $_commit^$_parent_number
+}
+
+commit_has_parents ()
+{
+    commit_buffer_contains_parents "$@" &&
+    commit_peeling_shows_parents "$@"
+}
+
 HASH1=
 HASH2=
 HASH3=
@@ -351,4 +384,60 @@ test_expect_success 'replace ref cleanup' '
        test -z "$(git replace)"
 '
 
+test_expect_success '--graft with and without already replaced object' '
+       test $(git log --oneline | wc -l) = 7 &&
+       git replace --graft $HASH5 &&
+       test $(git log --oneline | wc -l) = 3 &&
+       commit_has_parents $HASH5 &&
+       test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 &&
+       git replace --force -g $HASH5 $HASH4 $HASH3 &&
+       commit_has_parents $HASH5 $HASH4 $HASH3 &&
+       git replace -d $HASH5
+'
+
+test_expect_success GPG 'set up a signed commit' '
+       echo "line 17" >>hello &&
+       echo "line 18" >>hello &&
+       git add hello &&
+       test_tick &&
+       git commit --quiet -S -m "hello: 2 more lines in a signed commit" &&
+       HASH8=$(git rev-parse --verify HEAD) &&
+       git verify-commit $HASH8
+'
+
+test_expect_success GPG '--graft with a signed commit' '
+       git cat-file commit $HASH8 >orig &&
+       git replace --graft $HASH8 &&
+       git cat-file commit $HASH8 >repl &&
+       commit_has_parents $HASH8 &&
+       test_must_fail git verify-commit $HASH8 &&
+       sed -n -e "/^tree /p" -e "/^author /p" -e "/^committer /p" orig >expected &&
+       echo >>expected &&
+       sed -e "/^$/q" repl >actual &&
+       test_cmp expected actual &&
+       git replace -d $HASH8
+'
+
+test_expect_success GPG 'set up a merge commit with a mergetag' '
+       git reset --hard HEAD &&
+       git checkout -b test_branch HEAD~2 &&
+       echo "line 1 from test branch" >>hello &&
+       echo "line 2 from test branch" >>hello &&
+       git add hello &&
+       test_tick &&
+       git commit -m "hello: 2 more lines from a test branch" &&
+       HASH9=$(git rev-parse --verify HEAD) &&
+       git tag -s -m "tag for testing with a mergetag" test_tag HEAD &&
+       git checkout master &&
+       git merge -s ours test_tag &&
+       HASH10=$(git rev-parse --verify HEAD) &&
+       git cat-file commit $HASH10 | grep "^mergetag object"
+'
+
+test_expect_success GPG '--graft on a commit with a mergetag' '
+       test_must_fail git replace --graft $HASH10 $HASH8^1 &&
+       git replace --graft $HASH10 $HASH8^1 $HASH9 &&
+       git replace -d $HASH10
+'
+
 test_done