mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-14 04:18:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pw/t3428-cleanup'

Browse Source 
Test cleanup.

* pw/t3428-cleanup:
  t3428: restore coverage for "apply" backend
  t3428: use test_commit_message
  t3428: modernize test setup
This commit is contained in:
Junio C Hamano 2024-04-16 14:50:31 -07:00
commit 93e3f9df7a
1 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
t/t3428-rebase-signoff.sh
View File

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