diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-19 13:51:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-19 13:51:41 -0700 |
| commit | 8e2653586621c3e4579331dea2aad5010fb5926c (patch) | |
| tree | 6e8c9707586cbb7a8bfc23aecb44e47d481b4873 | |
| parent | d6645312ff82245a8e9bc8187ad16c57456bff38 (diff) | |
| parent | 5babb5bdb3d09ee670f7e3a3ae596eb2f1d02268 (diff) | |
| download | git-8e2653586621c3e4579331dea2aad5010fb5926c.tar.gz git-8e2653586621c3e4579331dea2aad5010fb5926c.tar.xz | |
Merge branch 'js/t6026-clean-up' into maint
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 dd8f88d18..7a6e33e67 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" && |