diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 20:42:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 20:42:30 (GMT) |
| commit | 8a17eb7972401244c585f4ad7e33452a767c3617 (patch) | |
| tree | 5dc0c23a508cf11ea3dfbdb4815ef21a4b0f4f97 | |
| parent | 54bbadaeca930183989bcd097bde7befa98dc2f9 (diff) | |
| parent | e4837b4406ae7a7192e22359dc94d69b8a8ef69d (diff) | |
| download | git-8a17eb7972401244c585f4ad7e33452a767c3617.zip git-8a17eb7972401244c585f4ad7e33452a767c3617.tar.gz git-8a17eb7972401244c585f4ad7e33452a767c3617.tar.bz2 | |
Merge branch 'jk/test-fixes' into maint
Test fixes.
* jk/test-fixes:
t7800: don't rely on reuse_worktree_file()
t4018: drop "debugging" cat from hunk-header tests
| -rwxr-xr-x | t/t4018-diff-funcname.sh | 1 | ||||
| -rwxr-xr-x | t/t7800-difftool.sh | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index c0f4839..02255a0 100755 --- a/t/t4018-diff-funcname.sh +++ b/t/t4018-diff-funcname.sh @@ -106,7 +106,6 @@ do result=success fi test_expect_$result "hunk header: $i" " - test_when_finished 'cat actual' && # for debugging only git diff -U1 $i >actual && grep '@@ .* @@.*RIGHT' actual " diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 6bac9ed..29b9290 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -125,15 +125,14 @@ test_expect_success 'difftool stops on error with --trust-exit-code' ' test_when_finished "rm -f for-diff .git/fail-right-file" && test_when_finished "git reset -- for-diff" && write_script .git/fail-right-file <<-\EOF && - echo "$2" + echo failed exit 1 EOF >for-diff && git add for-diff && - echo file >expect && test_must_fail git difftool -y --trust-exit-code \ --extcmd .git/fail-right-file branch >actual && - test_cmp expect actual + test_line_count = 1 actual ' test_expect_success 'difftool honors exit status if command not found' ' |