diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-21 23:14:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-21 23:14:37 (GMT) |
| commit | c7707a4354f36c59f3310d4edfb18377c064220e (patch) | |
| tree | e77a6031b8e1f5b700d334389a3235313d4d642f /builtin/push.c | |
| parent | 0cfba96121b9617668a7b4ad18e3ae3a19dc8755 (diff) | |
| parent | 01fdc21f6e90f56fc5a49cbba751d9ead19b2f03 (diff) | |
| download | git-c7707a4354f36c59f3310d4edfb18377c064220e.zip git-c7707a4354f36c59f3310d4edfb18377c064220e.tar.gz git-c7707a4354f36c59f3310d4edfb18377c064220e.tar.bz2 | |
Merge branch 'cb/transfer-no-progress' into maint
* cb/transfer-no-progress:
push/fetch/clone --no-progress suppresses progress output
Diffstat (limited to 'builtin/push.c')
| -rw-r--r-- | builtin/push.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/push.c b/builtin/push.c index 35cce53..6c373cf 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -19,7 +19,7 @@ static int thin; static int deleterefs; static const char *receivepack; static int verbosity; -static int progress; +static int progress = -1; static const char **refspec; static int refspec_nr; @@ -260,7 +260,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) OPT_STRING( 0 , "exec", &receivepack, "receive-pack", "receive pack program"), OPT_BIT('u', "set-upstream", &flags, "set upstream for git pull/status", TRANSPORT_PUSH_SET_UPSTREAM), - OPT_BOOLEAN(0, "progress", &progress, "force progress reporting"), + OPT_BOOL(0, "progress", &progress, "force progress reporting"), OPT_END() }; |