diff options
Diffstat (limited to 't/t6200-fmt-merge-msg.sh')
| -rwxr-xr-x | t/t6200-fmt-merge-msg.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index ac57b0e4ae..011e5df1e6 100755 --- a/t/t6200-fmt-merge-msg.sh +++ b/t/t6200-fmt-merge-msg.sh @@ -8,7 +8,6 @@ test_description='fmt-merge-msg test' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME -TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh . "$TEST_DIRECTORY/lib-gpg.sh" @@ -608,34 +607,34 @@ test_expect_success 'merge-msg with "merging" an annotated tag' ' git checkout main^0 && git commit --allow-empty -m "One step ahead" && - git tag -a -m "An annotated one" annote HEAD && + git tag -a -m "An annotated one" annotate HEAD && git checkout main && - git fetch . annote && + git fetch . annotate && git fmt-merge-msg <.git/FETCH_HEAD >actual && { cat <<-\EOF - Merge tag '\''annote'\'' + Merge tag '\''annotate'\'' An annotated one - * tag '\''annote'\'': + * tag '\''annotate'\'': One step ahead EOF } >expected && test_cmp expected actual && test_when_finished "git reset --hard" && - annote=$(git rev-parse annote) && - git merge --no-commit --no-ff $annote && + annotate=$(git rev-parse annotate) && + git merge --no-commit --no-ff $annotate && { cat <<-EOF - Merge tag '\''$annote'\'' + Merge tag '\''$annotate'\'' An annotated one - * tag '\''$annote'\'': + * tag '\''$annotate'\'': One step ahead EOF } >expected && |