push: pass --progress down to git-pack-objects

peff · gitster · commit d7c411b71d72 · 2010-10-18T16:20:19.000-07:00
When pushing via builtin transports (like file://, git://), the
underlying transport helper (in this case, git-pack-objects) did not get
the --progress option, even if it was passed to git push.

Fix this, and update the tests to reflect this.

Note that according to the git-pack-objects documentation, we can safely
apply the usual --progress semantics for the transport commands like
clone and fetch (and for pushing over other smart transports).

Reported-by: Chase Brammer &lt;cbrammer@gmail.com&gt;
Helped-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Tay Ray Chuan &lt;rctay89@gmail.com&gt;
Reviewed-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
@@ -48,6 +48,7 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext
 		NULL,
 		NULL,
 		NULL,
+		NULL,
 	};
 	struct child_process po;
 	int i;
@@ -59,6 +60,8 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext
 		argv[i++] = "--delta-base-offset";
 	if (args->quiet)
 		argv[i++] = "-q";
+	if (args->progress)
+		argv[i++] = "--progress";
 	memset(&po, 0, sizeof(po));
 	po.argv = argv;
 	po.in = -1;
diff --git a/send-pack.h b/send-pack.h
@@ -5,6 +5,7 @@ struct send_pack_args {
 	unsigned verbose:1,
 		quiet:1,
 		porcelain:1,
+		progress:1,
 		send_mirror:1,
 		force_update:1,
 		use_thin_pack:1,
diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
@@ -78,15 +78,15 @@ test_expect_success TTY 'progress messages go to tty' '
 	grep "Writing objects" err
 '
 
-test_expect_failure 'progress messages do not go to non-tty' '
+test_expect_success 'progress messages do not go to non-tty' '
 	ensure_fresh_upstream &&
 
 	# skip progress messages, since stderr is non-tty
 	git push -u upstream master >out 2>err &&
 	! grep "Writing objects" err
 '
 
-test_expect_failure 'progress messages go to non-tty (forced)' '
+test_expect_success 'progress messages go to non-tty (forced)' '
 	ensure_fresh_upstream &&
 
 	# force progress messages to stderr, even though it is non-tty
diff --git a/transport.c b/transport.c
@@ -789,6 +789,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
 	args.use_thin_pack = data->options.thin;
 	args.verbose = (transport->verbose > 0);
 	args.quiet = (transport->verbose < 0);
+	args.progress = transport->progress;
 	args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN);
 	args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN);
 

Original file line number	Diff line number	Diff line change
`@@ -78,15 +78,15 @@ test_expect_success TTY 'progress messages go to tty' '`
`78`	`78`	`grep "Writing objects" err`
`79`	`79`	`'`
`80`	`80`
`81`		`-test_expect_failure 'progress messages do not go to non-tty' '`
	`81`	`+test_expect_success 'progress messages do not go to non-tty' '`
`82`	`82`	`ensure_fresh_upstream &&`
`83`	`83`
`84`	`84`	`# skip progress messages, since stderr is non-tty`
`85`	`85`	`git push -u upstream master >out 2>err &&`
`86`	`86`	`! grep "Writing objects" err`
`87`	`87`	`'`
`88`	`88`
`89`		`-test_expect_failure 'progress messages go to non-tty (forced)' '`
	`89`	`+test_expect_success 'progress messages go to non-tty (forced)' '`
`90`	`90`	`ensure_fresh_upstream &&`
`91`	`91`
`92`	`92`	`# force progress messages to stderr, even though it is non-tty`