@@ -40,46 +40,39 @@ test_expect_success 'setup' '
4040# on the next subtest we can show that --no-signoff overrides the alias
4141test_expect_success ' rebase --signoff adds a sign-off line' '
4242 git rbs HEAD^ &&
43- git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
44- test_cmp expected-signed actual
43+ test_commit_message HEAD expected-signed
4544'
4645
4746test_expect_success ' rebase --no-signoff does not add a sign-off line' '
4847 git commit --amend -m "first" &&
4948 git rbs --no-signoff HEAD^ &&
50- git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
51- test_cmp expected-unsigned actual
49+ test_commit_message HEAD expected-unsigned
5250'
5351
5452test_expect_success ' rebase --exec --signoff adds a sign-off line' '
5553 test_when_finished "rm exec" &&
5654 git commit --amend -m "first" &&
5755 git rebase --exec "touch exec" --signoff HEAD^ &&
5856 test_path_is_file exec &&
59- git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
60- test_cmp expected-signed actual
57+ test_commit_message HEAD expected-signed
6158'
6259
6360test_expect_success ' rebase --root --signoff adds a sign-off line' '
6461 git commit --amend -m "first" &&
6562 git rebase --root --keep-empty --signoff &&
66- git cat-file commit HEAD^ | sed -e "1,/^\$/d" >actual &&
67- test_cmp expected-initial-signed actual &&
68- git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
69- test_cmp expected-signed actual
63+ test_commit_message HEAD^ expected-initial-signed &&
64+ test_commit_message HEAD expected-signed
7065'
7166
7267test_expect_success ' rebase -i --signoff fails' '
7368 git commit --amend -m "first" &&
7469 git rebase -i --signoff HEAD^ &&
75- git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
76- test_cmp expected-signed actual
70+ test_commit_message HEAD expected-signed
7771'
7872
7973test_expect_success ' rebase -m --signoff fails' '
8074 git commit --amend -m "first" &&
8175 git rebase -m --signoff HEAD^ &&
82- git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
83- test_cmp expected-signed actual
76+ test_commit_message HEAD expected-signed
8477'
8578test_done
0 commit comments