mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t6406: skip "external merge driver getting killed by a signal" test on Windows

Browse Source 
The run_command() on the platform does not seem to report death by
signal as the caller expects.  For now, skip the test on Windows.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2023-06-23 16:34:40 -07:00
parent 2b7b788fb3
commit 34d765e736
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t6406-merge-attr.sh
View File

@ -168,7 +168,7 @@ test_expect_success 'custom merge backend' '
rm -f $o $a $b rm -f $o $a $b
' '
test_expect_success 'custom merge driver that is killed with a signal' ' test_expect_success !WINDOWS 'custom merge driver that is killed with a signal' '
test_when_finished "rm -f output please-abort" && test_when_finished "rm -f output please-abort" &&
git reset --hard anchor && git reset --hard anchor &&