Browse Source

transport: pass "quiet" flag to pack-objects

When pushing over the git protocol, pack-objects gives
progress reports about the pack being sent. If "push" is
given the --quiet flag, it now passes "-q" to pack-objects,
suppressing this output.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 16 years ago committed by Junio C Hamano
parent
commit
120703292b
  1. 3
      builtin-send-pack.c
  2. 1
      send-pack.h
  3. 1
      transport.c

3
builtin-send-pack.c

@ -44,6 +44,7 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext
NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL,
}; };
struct child_process po; struct child_process po;
int i; int i;
@ -53,6 +54,8 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext
argv[i++] = "--thin"; argv[i++] = "--thin";
if (args->use_ofs_delta) if (args->use_ofs_delta)
argv[i++] = "--delta-base-offset"; argv[i++] = "--delta-base-offset";
if (args->quiet)
argv[i++] = "-q";
memset(&po, 0, sizeof(po)); memset(&po, 0, sizeof(po));
po.argv = argv; po.argv = argv;
po.in = -1; po.in = -1;

1
send-pack.h

@ -3,6 +3,7 @@


struct send_pack_args { struct send_pack_args {
unsigned verbose:1, unsigned verbose:1,
quiet:1,
send_mirror:1, send_mirror:1,
force_update:1, force_update:1,
use_thin_pack:1, use_thin_pack:1,

1
transport.c

@ -892,6 +892,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); args.force_update = !!(flags & TRANSPORT_PUSH_FORCE);
args.use_thin_pack = data->thin; args.use_thin_pack = data->thin;
args.verbose = !!(flags & TRANSPORT_PUSH_VERBOSE); args.verbose = !!(flags & TRANSPORT_PUSH_VERBOSE);
args.quiet = !!(flags & TRANSPORT_PUSH_QUIET);
args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN);


ret = send_pack(&args, data->fd, data->conn, remote_refs, ret = send_pack(&args, data->fd, data->conn, remote_refs,

Loading…
Cancel
Save