[PATCH v2 08/10] push: learn --progress
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
---
Documentation/git-push.txt | 9 ++++++++-
builtin-push.c | 4 +++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index ddb78eb..59dc8b1 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -149,12 +149,19 @@ useful if you write an alias or script around 'git push'.
-q::
--quiet::
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::
--verbose::
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[]
OUTPUT
diff --git a/builtin-push.c b/builtin-push.c
index dce3152..ba9fe49 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -18,6 +18,7 @@ static int thin;
static int deleterefs;
static const char *receivepack;
static int verbosity;
+static int progress;
static const char **refspec;
static int refspec_nr;
@@ -107,7 +108,7 @@ static int push_with_options(struct transport *transport, int flags)
int err;
int nonfastforward;
- transport_set_verbosity(transport, verbosity, 0);
+ transport_set_verbosity(transport, verbosity, progress);
if (receivepack)
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_BIT('u', "set-upstream", &flags, "set upstream for git pull/status",
TRANSPORT_PUSH_SET_UPSTREAM),
+ OPT_BOOLEAN(0, "progress", &progress, "force progress reporting"),
OPT_END()
};
--
1.7.0.20.gcb44ed
Tay Ray Chuan <rctay89@gmail.com>