clone: send diagnostic messages to stderr

peff · gitster · commit 68b939b2f097 · 2013-09-18T13:34:12.000-07:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/clone.c b/builtin/clone.c
@@ -380,7 +380,7 @@ static void clone_local(const char *src_repo, const char *dest_repo)
 	}
 
 	if (0 <= option_verbosity)
-		printf(_("done.\n"));
+		fprintf(stderr, _("done.\n"));
 }
 
 static const char *junk_work_tree;
@@ -552,12 +552,12 @@ static void update_remote_refs(const struct ref *refs,
 
 	if (check_connectivity) {
 		if (0 <= option_verbosity)
-			printf(_("Checking connectivity... "));
+			fprintf(stderr, _("Checking connectivity... "));
 		if (check_everything_connected_with_transport(iterate_ref_map,
 							      0, &rm, transport))
 			die(_("remote did not send all necessary objects"));
 		if (0 <= option_verbosity)
-			printf(_("done\n"));
+			fprintf(stderr, _("done\n"));
 	}
 
 	if (refs) {
@@ -850,9 +850,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
 	if (0 <= option_verbosity) {
 		if (option_bare)
-			printf(_("Cloning into bare repository '%s'...\n"), dir);
+			fprintf(stderr, _("Cloning into bare repository '%s'...\n"), dir);
 		else
-			printf(_("Cloning into '%s'...\n"), dir);
+			fprintf(stderr, _("Cloning into '%s'...\n"), dir);
 	}
 	init_db(option_template, INIT_DB_QUIET);
 	write_config(&option_config);
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
@@ -36,7 +36,7 @@ test_expect_success 'clone with excess parameters (2)' '
 
 test_expect_success C_LOCALE_OUTPUT 'output from clone' '
 	rm -fr dst &&
-	git clone -n "file://$(pwd)/src" dst >output &&
+	git clone -n "file://$(pwd)/src" dst >output 2>&1 &&
 	test $(grep Clon output | wc -l) = 1
 '
 
diff --git 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
 
 '
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ test_expect_success 'clone with excess parameters (2)' '`
`36`	`36`
`37`	`37`	`test_expect_success C_LOCALE_OUTPUT 'output from clone' '`
`38`	`38`	`rm -fr dst &&`
`39`		`- git clone -n "file://$(pwd)/src" dst >output &&`
	`39`	`+ git clone -n "file://$(pwd)/src" dst >output 2>&1 &&`
`40`	`40`	`test $(grep Clon output \| wc -l) = 1`
`41`	`41`	`'`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -19,17 +19,18 @@ test_expect_success 'clone -o' '`
`19`	`19`
`20`	`20`	`'`
`21`	`21`
`22`		`-test_expect_success 'redirected clone' '`
	`22`	`+test_expect_success 'redirected clone does not show progress' '`
`23`	`23`
`24`	`24`	`git clone "file://$(pwd)/parent" clone-redirected >out 2>err &&`
`25`		`- test_must_be_empty err`
	`25`	`+ ! grep % err`
`26`	`26`
`27`	`27`	`'`
`28`		`-test_expect_success 'redirected clone -v' '`
	`28`	`+`
	`29`	`+test_expect_success 'redirected clone -v does show progress' '`
`29`	`30`
`30`	`31`	`git clone --progress "file://$(pwd)/parent" clone-redirected-progress \`
`31`	`32`	`>out 2>err &&`
`32`		`- test -s err`
	`33`	`+ grep % err`
`33`	`34`
`34`	`35`	`'`
`35`	`36`