[PATCH jk/pkt-line-cleanup] t5700-clone-reference: send trace to fd 2, not 3, to please Windows git
- From
Johannes Sixt <j.sixt@viscovery.net>
- Date
- Mar 20, 2013, 08:24 UTC
- Message-ID
- <5149724C.3060105@viscovery.net>
From: Johannes Sixt <j6t@kdbg.org>
Two tests use GIT_TRACE=3 to dump debugging information of git. On Windows, however, bash is unable to set up file descriptor 3 correctly for its child process, so that git reports "Bad file descriptor" on every trace attempt. The 'git clone' test succeeds nevertheless because an empty trace file remains, and there is only a check for the absence of a particular line. But the 'git fetch' process ultimately hangs (the dynamics that lead to this surprising result have not been investigated).
Since we do not otherwise use stderr in the test cases, divert the trace dump to stderr.
Signed-off-by: Johannes Sixt <j6t@kdbg.org> --- This fixes a regression introduced in
t/t5700-clone-reference.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh index 9cd3b4d..8b5c58e 100755 --- a/t/t5700-clone-reference.sh +++ b/t/t5700-clone-reference.sh @@ -55,7 +55,7 @@ cd "$base_dir" rm -f "$U.D" test_expect_success 'cloning with reference (no -l -s)' \ -'GIT_TRACE_PACKET=3 git clone --reference B "file://$(pwd)/A" D 3>"$U.D"' +'GIT_TRACE_PACKET=2 git clone --reference B "file://$(pwd)/A" D 2>"$U.D"' test_expect_success 'fetched no objects' \ '! grep " want" "$U.D"' @@ -173,7 +173,7 @@ test_expect_success 'fetch with incomplete alternates' ' ( cd K && git remote add J "file://$base_dir/J" && - GIT_TRACE_PACKET=3 git fetch J 3>"$U.K" + GIT_TRACE_PACKET=2 git fetch J 2>"$U.K" ) && master_object=$(cd A && git for-each-ref --format="%(objectname)" refs/heads/master) && ! grep " want $master_object" "$U.K" &&
-- 1.8.2.1298.g2825a8e