mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'sg/fast-import-dump-refs-on-checkpoint-fix'
Test update. * sg/fast-import-dump-refs-on-checkpoint-fix: t9300: wait for background fast-import process to die after killing it
This commit is contained in:
commit
1638a625ca
|
@ -3147,7 +3147,10 @@ background_import_then_checkpoint () {
|
|||
echo $! >V.pid
|
||||
# We don't mind if fast-import has already died by the time the test
|
||||
# ends.
|
||||
test_when_finished "exec 8>&-; exec 9>&-; kill $(cat V.pid) || true"
|
||||
test_when_finished "
|
||||
exec 8>&-; exec 9>&-;
|
||||
kill $(cat V.pid) && wait $(cat V.pid)
|
||||
true"
|
||||
|
||||
# Start in the background to ensure we adhere strictly to (blocking)
|
||||
# pipes writing sequence. We want to assume that the write below could
|
||||
|
|
Loading…
Reference in a new issue