1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-13 20:26:08 +02:00

t3428: modernize test setup

Perform the setup in a dedicated test so the later tests can be run
independently. Also avoid running git upstream of a pipe and take
advantage of test_commit.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2024-04-09 15:27:22 +00:00 committed by Junio C Hamano
parent 0d1bd1dfb3
commit aac1c6e8f5

View File

@ -8,37 +8,37 @@ This test runs git rebase --signoff and make sure that it works.
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# A simple file to commit
cat >file <<EOF
a
EOF
test_expect_success 'setup' '
git commit --allow-empty -m "Initial empty commit" &&
test_commit first file a &&
# Expected commit message for initial commit after rebase --signoff
cat >expected-initial-signed <<EOF
Initial empty commit
ident="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" &&
Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/")
EOF
# Expected commit message for initial commit after rebase --signoff
cat >expected-initial-signed <<-EOF &&
Initial empty commit
# Expected commit message after rebase --signoff
cat >expected-signed <<EOF
first
Signed-off-by: $ident
EOF
Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/")
EOF
# Expected commit message after rebase --signoff
cat >expected-signed <<-EOF &&
first
# Expected commit message after rebase without --signoff (or with --no-signoff)
cat >expected-unsigned <<EOF
first
EOF
Signed-off-by: $ident
EOF
# Expected commit message after rebase without --signoff (or with --no-signoff)
cat >expected-unsigned <<-EOF &&
first
EOF
git config alias.rbs "rebase --signoff"
'
# We configure an alias to do the rebase --signoff so that
# on the next subtest we can show that --no-signoff overrides the alias
test_expect_success 'rebase --signoff adds a sign-off line' '
git commit --allow-empty -m "Initial empty commit" &&
git add file && git commit -m first &&
git config alias.rbs "rebase --signoff" &&
git rbs HEAD^ &&
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
test_cmp expected-signed actual