diff options
| author | Pranit Bauva <pranit.bauva@gmail.com> | 2017-01-03 19:57:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-07 21:20:01 (GMT) |
| commit | c7cf956618c4af9f3151a90d7552b05767e6444f (patch) | |
| tree | ea074b87fcb872c13df8b0b5d2c3d2b12c5a89d6 /t/t7610-mergetool.sh | |
| parent | a274e0a036ea886a31f8b216564ab1b4a3142f6c (diff) | |
| download | git-c7cf956618c4af9f3151a90d7552b05767e6444f.zip git-c7cf956618c4af9f3151a90d7552b05767e6444f.tar.gz git-c7cf956618c4af9f3151a90d7552b05767e6444f.tar.bz2 | |
don't use test_must_fail with grep
test_must_fail should only be used for testing git commands. To test the
failure of other commands use `!`.
Reported-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 6d9f215..caf907b 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -601,7 +601,7 @@ test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToT test_config mergetool.myecho.trustExitCode true && test_must_fail git merge master && git mergetool --no-prompt --tool myecho -- both >actual && - test_must_fail grep ^\./both_LOCAL_ actual >/dev/null && + ! grep ^\./both_LOCAL_ actual >/dev/null && grep /both_LOCAL_ actual >/dev/null && git reset --hard master >/dev/null 2>&1 ' |