t3428: use test_commit_message
Using a helper function makes the tests shorter and avoids running "git cat-file" upstream of a pipe. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Apr 9, 2024 at 15:27 UTC
1ad81756b4d573f455d40b182ce2fa3d53318fd0
1 file changed
+7
-14
t/t3428-rebase-signoff.sh
+7
-14
@@ -40,15 +40,13 @@ test_expect_success 'setup' '
40
# on the next subtest we can show that --no-signoff overrides the alias
41
test_expect_success 'rebase --signoff adds a sign-off line' '
42
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
44
'
45
46
test_expect_success 'rebase --no-signoff does not add a sign-off line' '
47
git commit --amend -m "first" &&
48
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
50
'
51
52
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' '
54
git commit --amend -m "first" &&
55
git rebase --exec "touch exec" --signoff HEAD^ &&
56
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
58
'
59
60
test_expect_success 'rebase --root --signoff adds a sign-off line' '
61
git commit --amend -m "first" &&
62
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
65
'
66
67
test_expect_success 'rebase -i --signoff fails' '
68
git commit --amend -m "first" &&
69
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
71
'
72
73
test_expect_success 'rebase -m --signoff fails' '
74
git commit --amend -m "first" &&
75
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
77
'
78
test_done