push: learn --progress

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Tay Ray Chuan 2010-02-24 20:50:27 +08:00 committed by Junio C Hamano
parent d01b3c02e8
commit 7838106925
2 changed files with 11 additions and 2 deletions

View File

@ -148,12 +148,19 @@ useful if you write an alias or script around 'git push'.
-q:: -q::
--quiet:: --quiet::
Suppress all output, including the listing of updated refs, Suppress all output, including the listing of updated refs,
unless an error occurs. unless an error occurs. Progress is not reported to the standard
error stream.


-v:: -v::
--verbose:: --verbose::
Run verbosely. Run verbosely.


--progress::
Progress status is reported on the standard error stream
by default when it is attached to a terminal, unless -q
is specified. This flag forces progress status even if the
standard error stream is not directed to a terminal.

include::urls-remotes.txt[] include::urls-remotes.txt[]


OUTPUT OUTPUT

View File

@ -18,6 +18,7 @@ static int thin;
static int deleterefs; static int deleterefs;
static const char *receivepack; static const char *receivepack;
static int verbosity; static int verbosity;
static int progress;


static const char **refspec; static const char **refspec;
static int refspec_nr; static int refspec_nr;
@ -107,7 +108,7 @@ static int push_with_options(struct transport *transport, int flags)
int err; int err;
int nonfastforward; int nonfastforward;


transport_set_verbosity(transport, verbosity, 0); transport_set_verbosity(transport, verbosity, progress);


if (receivepack) if (receivepack)
transport_set_option(transport, transport_set_option(transport,
@ -223,6 +224,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"), OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"),
OPT_BIT('u', "set-upstream", &flags, "set upstream for git pull/status", OPT_BIT('u', "set-upstream", &flags, "set upstream for git pull/status",
TRANSPORT_PUSH_SET_UPSTREAM), TRANSPORT_PUSH_SET_UPSTREAM),
OPT_BOOLEAN(0, "progress", &progress, "force progress reporting"),
OPT_END() OPT_END()
}; };