push: pass --progress down to git-pack-objects
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 <cbrammer@gmail.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
8ac3ed27d4
commit
d7c411b71d
@ -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;
|
||||
|
@ -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,
|
||||
|
@ -78,7 +78,7 @@ 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
|
||||
@ -86,7 +86,7 @@ test_expect_failure 'progress messages do not go to non-tty' '
|
||||
! 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
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user