diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7502-commit.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index f1112639b..3eb9faedc 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -141,16 +141,15 @@ test_expect_success 'cleanup commit messages (strip,-F)' ' echo "sample -# Please enter the commit message for your changes. -# To abort the commit, use an empty commit message. -# (Comment lines starting with '#' will not be included)" >expect +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit." >expect test_expect_success 'cleanup commit messages (strip,-F,-e)' ' echo >>negative && { echo;echo sample;echo; } >text && git commit -e -F text -a && - head -n 5 .git/COMMIT_EDITMSG >actual && + head -n 4 .git/COMMIT_EDITMSG >actual && test_cmp expect actual ' @@ -163,7 +162,7 @@ test_expect_success 'author different from committer' ' echo >>negative && git commit -e -m "sample" - head -n 8 .git/COMMIT_EDITMSG >actual && + head -n 7 .git/COMMIT_EDITMSG >actual && test_cmp expect actual ' @@ -182,7 +181,7 @@ test_expect_success 'committer is automatic' ' # must fail because there is no change test_must_fail git commit -e -m "sample" ) && - head -n 9 .git/COMMIT_EDITMSG | \ + head -n 8 .git/COMMIT_EDITMSG | \ sed "s/^# Committer: .*/# Committer:/" >actual && test_cmp expect actual ' |