mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
t6026-merge-attr: clean up background process at end of test case
The process spawned in the hook uses the test's trash directory as CWD. As long as it is alive, the directory cannot be removed on Windows. Although the test succeeds, the 'test_done' that follows produces an error message and leaves the trash directory around. Kill the process before the test case advances. Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6ebdac1bab
commit
5babb5bdb3
|
@ -185,7 +185,9 @@ test_expect_success 'custom merge does not lock index' '
|
|||
git reset --hard anchor &&
|
||||
write_script sleep-one-second.sh <<-\EOF &&
|
||||
sleep 1 &
|
||||
echo $! >sleep.pid
|
||||
EOF
|
||||
test_when_finished "kill \$(cat sleep.pid)" &&
|
||||
|
||||
test_write_lines >.gitattributes \
|
||||
"* merge=ours" "text merge=sleep-one-second" &&
|
||||
|
|
Loading…
Reference in a new issue