diff options
Diffstat (limited to 't/t7501-commit-basic-functionality.sh')
| -rwxr-xr-x | t/t7501-commit-basic-functionality.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t7501-commit-basic-functionality.sh b/t/t7501-commit-basic-functionality.sh index a37509f004..7794babe46 100755 --- a/t/t7501-commit-basic-functionality.sh +++ b/t/t7501-commit-basic-functionality.sh @@ -342,12 +342,12 @@ test_expect_success 'overriding author from command line' ' echo gak >file && git commit -m author \ --author "Rubber Duck <rduck@convoy.org>" -a >output 2>&1 && - grep Rubber.Duck output + test_grep Rubber.Duck output ' test_expect_success 'interactive add' ' echo 7 | test_must_fail git commit --interactive >out && - grep "What now" out + test_grep "What now" out ' test_expect_success "commit --interactive doesn't change index if editor aborts" ' @@ -376,13 +376,13 @@ test_expect_success 'editor not invoked if -F is given' ' EDITOR=./editor git commit -a -F msg && git show -s --pretty=format:%s >subject && - grep -q good subject && + test_grep -q good subject && echo quack >file && echo Another good message. | EDITOR=./editor git commit -a -F - && git show -s --pretty=format:%s >subject && - grep -q good subject + test_grep -q good subject ' test_expect_success 'partial commit that involves removal (1)' ' @@ -471,7 +471,7 @@ test_expect_success 'amend does not add signoff if it already exists' ' test_expect_success 'commit mentions forced date in output' ' git commit --amend --date=2010-01-02T03:04:05 >output && - grep "Date: *Sat Jan 2 03:04:05 2010" output + test_grep "Date: *Sat Jan 2 03:04:05 2010" output ' test_expect_success 'commit complains about completely bogus dates' ' @@ -660,9 +660,9 @@ test_expect_success 'git commit <file> with dirty index' ' git add chz && git commit elif -m "tacocat is a palindrome" && git show --stat >stat && - grep elif stat && + test_grep elif stat && git diff --cached >diff && - grep chz diff + test_grep chz diff ' test_expect_success 'same tree (single parent)' ' @@ -676,7 +676,7 @@ test_expect_success 'same tree (single parent) --allow-empty' ' git commit --allow-empty -m "forced empty" && git cat-file commit HEAD >commit && - grep forced commit + test_grep forced commit ' |