Merge branch 'pw/t3428-cleanup'

Test cleanup.

* pw/t3428-cleanup:
  t3428: restore coverage for "apply" backend
  t3428: use test_commit_message
  t3428: modernize test setup

diff --git a/t/t3428-rebase-signoff.sh b/t/t3428-rebase-signoff.sh
index e1b1e947647462f7cbc9fb2492b2cfe127056f1e..1bebd1ce74a0ac37b97090490a26afcf2004cc59 100755 (executable)
--- a/t/t3428-rebase-signoff.sh
+++ b/t/t3428-rebase-signoff.sh
@@ -8,47 +8,45 @@ 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 &&
+
+       ident="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" &&
 
-# Expected commit message for initial commit after rebase --signoff
-cat >expected-initial-signed <<EOF
-Initial empty commit
+       # Expected commit message for initial commit after rebase --signoff
+       cat >expected-initial-signed <<-EOF &&
+       Initial empty commit
 
-Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/")
-EOF
+       Signed-off-by: $ident
+       EOF
 
-# Expected commit message after rebase --signoff
-cat >expected-signed <<EOF
-first
+       # Expected commit message after rebase --signoff
+       cat >expected-signed <<-EOF &&
+       first
 
-Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/")
-EOF
+       Signed-off-by: $ident
+       EOF
 
-# Expected commit message after rebase without --signoff (or with --no-signoff)
-cat >expected-unsigned <<EOF
-first
-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
+test_expect_success 'rebase --apply --signoff adds a sign-off line' '
+       git rbs --apply HEAD^ &&
+       test_commit_message HEAD expected-signed
 '
 
 test_expect_success 'rebase --no-signoff does not add a sign-off line' '
        git commit --amend -m "first" &&
        git rbs --no-signoff HEAD^ &&
-       git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
-       test_cmp expected-unsigned actual
+       test_commit_message HEAD expected-unsigned
 '
 
 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 rebase --exec "touch exec" --signoff HEAD^ &&
        test_path_is_file exec &&
-       git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-       test_cmp expected-signed actual
+       test_commit_message HEAD expected-signed
 '
 
 test_expect_success 'rebase --root --signoff adds a sign-off line' '
        git commit --amend -m "first" &&
        git rebase --root --keep-empty --signoff &&
-       git cat-file commit HEAD^ | sed -e "1,/^\$/d" >actual &&
-       test_cmp expected-initial-signed actual &&
-       git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-       test_cmp expected-signed actual
+       test_commit_message HEAD^ expected-initial-signed &&
+       test_commit_message HEAD expected-signed
 '
 
 test_expect_success 'rebase -i --signoff fails' '
        git commit --amend -m "first" &&
        git rebase -i --signoff HEAD^ &&
-       git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-       test_cmp expected-signed actual
+       test_commit_message HEAD expected-signed
 '
 
 test_expect_success 'rebase -m --signoff fails' '
        git commit --amend -m "first" &&
        git rebase -m --signoff HEAD^ &&
-       git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-       test_cmp expected-signed actual
+       test_commit_message HEAD expected-signed
 '
 test_done