summaryrefslogtreecommitdiff
path: root/t/t5702-clone-options.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2013-09-18 16:05:13 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-18 13:34:12 -0700
commit68b939b2f097b6675c4aaa178655559aa81b25cb (patch)
tree1c7fa9e2264491ead3357f6b8b33ae65f56ccb16 /t/t5702-clone-options.sh
parentGit 1.8.4 (diff)
downloadtgif-68b939b2f097b6675c4aaa178655559aa81b25cb.tar.xz
clone: send diagnostic messages to stderr
Putting messages like "Cloning into.." and "done" on stdout is un-Unix and uselessly clutters the stdout channel. Send them to stderr. We have to tweak two tests to accommodate this: 1. t5601 checks for doubled output due to forking, and doesn't actually care where the output goes; adjust it to check stderr. 2. t5702 is trying to test whether progress output was sent to stderr, but naively does so by checking whether stderr produced any output. Instead, have it look for "%", a token found in progress output but not elsewhere (and which lets us avoid hard-coding the progress text in the test). This should not regress any scripts that try to parse the current output, as the output is already internationalized and therefore unstable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5702-clone-options.sh')
-rwxr-xr-xt/t5702-clone-options.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/t/t5702-clone-options.sh b/t/t5702-clone-options.sh
index 85cadfad6d..d3dbdfe069 100755
--- a/t/t5702-clone-options.sh
+++ b/t/t5702-clone-options.sh
@@ -19,17 +19,18 @@ test_expect_success 'clone -o' '
'
-test_expect_success 'redirected clone' '
+test_expect_success 'redirected clone does not show progress' '
git clone "file://$(pwd)/parent" clone-redirected >out 2>err &&
- test_must_be_empty err
+ ! grep % err
'
-test_expect_success 'redirected clone -v' '
+
+test_expect_success 'redirected clone -v does show progress' '
git clone --progress "file://$(pwd)/parent" clone-redirected-progress \
>out 2>err &&
- test -s err
+ grep % err
'