diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-12 15:34:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-12 15:34:37 -0700 |
| commit | ba06991e5f1647d8a78b181562f4d8075c65c696 (patch) | |
| tree | 77adb0328ce8babf6e019003b34781ddf4c52d15 | |
| parent | Merge branch 'js/t9903-chaining' (diff) | |
| parent | t6026-merge-attr: clean up background process at end of test case (diff) | |
| download | tgif-ba06991e5f1647d8a78b181562f4d8075c65c696.tar.xz | |
Merge branch 'js/t6026-clean-up'
A test spawned a short-lived background process, which sometimes
prevented the test directory from getting removed at the end of the
script on some platforms.
* js/t6026-clean-up:
t6026-merge-attr: clean up background process at end of test case
| -rwxr-xr-x | t/t6026-merge-attr.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index dd8f88d187..7a6e33e673 100755 --- a/t/t6026-merge-attr.sh +++ b/t/t6026-merge-attr.sh @@ -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" && |