undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/test-fixes'

Browse Source 
Test fixes.

* jk/test-fixes:
  t7800: don't rely on reuse_worktree_file()
  t4018: drop "debugging" cat from hunk-header tests
This commit is contained in:
Junio C Hamano 2020-01-30 14:17:09 -08:00
commit 0afeb3fdf4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
t/t4018-diff-funcname.sh
View File

@ -106,7 +106,6 @@ do
result=success result=success
fi fi
test_expect_$result "hunk header: $i" " test_expect_$result "hunk header: $i" "
test_when_finished 'cat actual' && # for debugging only
git diff -U1 $i >actual && git diff -U1 $i >actual &&
grep '@@ .* @@.*RIGHT' actual grep '@@ .* @@.*RIGHT' actual
" "

5
t/t7800-difftool.sh
View File

@ -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 "rm -f for-diff .git/fail-right-file" &&
test_when_finished "git reset -- for-diff" && test_when_finished "git reset -- for-diff" &&
write_script .git/fail-right-file <<-\EOF && write_script .git/fail-right-file <<-\EOF &&
echo "$2" echo failed
exit 1 exit 1
EOF EOF
>for-diff && >for-diff &&
git add for-diff && git add for-diff &&
echo file >expect &&
test_must_fail git difftool -y --trust-exit-code \ test_must_fail git difftool -y --trust-exit-code \
--extcmd .git/fail-right-file branch >actual && --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' ' test_expect_success 'difftool honors exit status if command not found' '