@@ -40,46 +40,39 @@ test_expect_success 'setup' '
40
40
# on the next subtest we can show that --no-signoff overrides the alias
41
41
test_expect_success ' rebase --signoff adds a sign-off line' '
42
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
45
44
'
46
45
47
46
test_expect_success ' rebase --no-signoff does not add a sign-off line' '
48
47
git commit --amend -m "first" &&
49
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
52
50
'
53
51
54
52
test_expect_success ' rebase --exec --signoff adds a sign-off line' '
55
53
test_when_finished "rm exec" &&
56
54
git commit --amend -m "first" &&
57
55
git rebase --exec "touch exec" --signoff HEAD^ &&
58
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
61
58
'
62
59
63
60
test_expect_success ' rebase --root --signoff adds a sign-off line' '
64
61
git commit --amend -m "first" &&
65
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
70
65
'
71
66
72
67
test_expect_success ' rebase -i --signoff fails' '
73
68
git commit --amend -m "first" &&
74
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
77
71
'
78
72
79
73
test_expect_success ' rebase -m --signoff fails' '
80
74
git commit --amend -m "first" &&
81
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
84
77
'
85
78
test_done
0 commit comments