diff options
| author |  Matheus Tavares <matheus.bernardino@usp.br> | 2021-05-04 13:27:32 -0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-05-05 12:26:36 +0900 |
| commit | 6a7bc9d11823239183dd5f6547b13824a6a15fc2 (patch) | |
| tree | 0bc96c5f65efb513c8ac0a5f7e614ed647dbf40d /t/lib-parallel-checkout.sh | |
| parent | parallel-checkout: add tests for basic operations (diff) | |
| download | tgif-6a7bc9d11823239183dd5f6547b13824a6a15fc2.tar.xz | |
parallel-checkout: add tests related to path collisions
Add tests to confirm that path collisions are properly detected by
checkout workers, both to avoid race conditions and to report colliding
entries on clone.
Co-authored-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-parallel-checkout.sh')
| -rw-r--r-- | t/lib-parallel-checkout.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/lib-parallel-checkout.sh b/t/lib-parallel-checkout.sh index f60b22ef34..d6740425b1 100644 --- a/t/lib-parallel-checkout.sh +++ b/t/lib-parallel-checkout.sh @@ -22,12 +22,12 @@ test_checkout_workers () { local trace_file=trace-test-checkout-workers && rm -f "$trace_file" && - GIT_TRACE2="$(pwd)/$trace_file" "$@" && + GIT_TRACE2="$(pwd)/$trace_file" "$@" 2>&8 && local workers=$(grep "child_start\[..*\] git checkout--worker" "$trace_file" | wc -l) && test $workers -eq $expected_workers && rm "$trace_file" -} +} 8>&2 2>&4 # Verify that both the working tree and the index were created correctly verify_checkout () { |