describe: use argv-array

diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index d745cf4e5f8a6f24b60fd9c26bd1453310f881e3..4f09beca90ec18c9e541f1f880471f9f2de0de8a 100755 (executable)
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -632,7 +632,8 @@ test_expect_success 'status when cherry-picking before resolving conflicts' '
        cat >expected <<-\EOF &&
        # On branch cherry_branch
        # You are currently cherry-picking.
-       #   (fix conflicts and run "git commit")
+       #   (fix conflicts and run "git cherry-pick --continue")
+       #   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
        #
        # Unmerged paths:
        #   (use "git add <file>..." to mark resolution)
@@ -655,7 +656,8 @@ test_expect_success 'status when cherry-picking after resolving conflicts' '
        cat >expected <<-\EOF &&
        # On branch cherry_branch
        # You are currently cherry-picking.
-       #   (all conflicts fixed: run "git commit")
+       #   (all conflicts fixed: run "git cherry-pick --continue")
+       #   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
        #
        # Changes to be committed:
        #
@@ -686,10 +688,11 @@ test_expect_success 'status while reverting commit (conflicts)' '
        test_commit old to-revert.txt &&
        echo new >to-revert.txt &&
        test_commit new to-revert.txt &&
-       test_must_fail git revert HEAD^ &&
+       TO_REVERT=$(git rev-parse --short HEAD^) &&
+       test_must_fail git revert $TO_REVERT &&
        cat >expected <<-EOF
        # On branch master
-       # You are currently reverting a commit.
+       # You are currently reverting commit $TO_REVERT.
        #   (fix conflicts and run "git revert --continue")
        #   (use "git revert --abort" to cancel the revert operation)
        #
@@ -710,7 +713,7 @@ test_expect_success 'status while reverting commit (conflicts resolved)' '
        git add to-revert.txt &&
        cat >expected <<-EOF
        # On branch master
-       # You are currently reverting a commit.
+       # You are currently reverting commit $TO_REVERT.
        #   (all conflicts fixed: run "git revert --continue")
        #   (use "git revert --abort" to cancel the revert operation)
        #