@@ -33,12 +33,16 @@ test_expect_success 'setup: initial commit' '
'
test_expect_success '-m and -F do not mix' '
- git checkout HEAD file && echo >>file && git add file &&
+ git checkout HEAD file &&
+ echo >>file &&
+ git add file &&
test_must_fail git commit -m foo -m bar -F file
'
test_expect_success '-m and -C do not mix' '
- git checkout HEAD file && echo >>file && git add file &&
+ git checkout HEAD file &&
+ echo >>file &&
+ git add file &&
test_must_fail git commit -C HEAD -m illegal
'
@@ -134,18 +138,24 @@ test_expect_success 'empty commit message' '
'
test_expect_success 'template "emptyness" check does not kick in with -F' '
- git checkout HEAD file && echo >>file && git add file &&
+ git checkout HEAD file &&
+ echo >>file &&
+ git add file &&
git commit -t file -F file
'
test_expect_success 'template "emptyness" check' '
- git checkout HEAD file && echo >>file && git add file &&
+ git checkout HEAD file &&
+ echo >>file &&
+ git add file &&
test_must_fail git commit -t file 2>err &&
test_i18ngrep "did not edit" err
'
test_expect_success 'setup: commit message from file' '
- git checkout HEAD file && echo >>file && git add file &&
+ git checkout HEAD file &&
+ echo >>file &&
+ git add file &&
echo this is the commit message, coming from a file >msg &&
git commit -F msg -a
'