diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:47 -0700 |
| commit | ea64414426319b31fe9c2a1aae727c14d36d7d6f (patch) | |
| tree | 52d3e3d95e323fffad3eff728be0130e436ab03d | |
| parent | Merge branch 'nd/clone-case-smashing-warning' (diff) | |
| parent | t1404: increase core.packedRefsTimeout to avoid occasional test failure (diff) | |
| download | tgif-ea64414426319b31fe9c2a1aae727c14d36d7d6f.tar.xz | |
Merge branch 'sg/t1404-update-ref-test-timeout'
An attempt to unflake a test a bit.
* sg/t1404-update-ref-test-timeout:
t1404: increase core.packedRefsTimeout to avoid occasional test failure
| -rwxr-xr-x | t/t1404-update-ref-errors.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh index 2a42a589a4..51a4f4c0ac 100755 --- a/t/t1404-update-ref-errors.sh +++ b/t/t1404-update-ref-errors.sh @@ -559,9 +559,9 @@ test_expect_success 'no bogus intermediate values during delete' ' { # Note: the following command is intentionally run in the # background. We increase the timeout so that `update-ref` - # attempts to acquire the `packed-refs` lock for longer than - # it takes for us to do the check then delete it: - git -c core.packedrefstimeout=3000 update-ref -d $prefix/foo & + # attempts to acquire the `packed-refs` lock for much longer + # than it takes for us to do the check then delete it: + git -c core.packedrefstimeout=30000 update-ref -d $prefix/foo & } && pid2=$! && # Give update-ref plenty of time to get to the point where it tries |