push/fetch/clone --no-progress suppresses progress output

By default, progress output is disabled if stderr is not a terminal.
The --progress option can be used to force progress output anyways.
Conversely, --no-progress does not force progress output. In particular,
if stderr is a terminal, progress output is enabled.

This is unintuitive. Change --no-progress to force output off.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/clone.c b/builtin/clone.c
index 86db95473021bc8d0b1cc8850185e1660fd9c776..b9e882d3022ff78c7992d0f5b288109fab3803b7 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -45,7 +45,7 @@ static char *option_branch = NULL;
 static const char *real_git_dir;
 static char *option_upload_pack = "git-upload-pack";
 static int option_verbosity;
 static const char *real_git_dir;
 static char *option_upload_pack = "git-upload-pack";
 static int option_verbosity;

-static int option_progress;
+static int option_progress = -1;

 static struct string_list option_config;
 static struct string_list option_reference;
 
 static struct string_list option_config;
 static struct string_list option_reference;
 


@@ -60,8 +60,8 @@ static int opt_parse_reference(const struct option *opt, const char *arg, int un
 
 static struct option builtin_clone_options[] = {
        OPT__VERBOSITY(&option_verbosity),
 
 static struct option builtin_clone_options[] = {
        OPT__VERBOSITY(&option_verbosity),

-       OPT_BOOLEAN(0, "progress", &option_progress,
-                       "force progress reporting"),
+       OPT_BOOL(0, "progress", &option_progress,
+                "force progress reporting"),

        OPT_BOOLEAN('n', "no-checkout", &option_no_checkout,
                    "don't create a checkout"),
        OPT_BOOLEAN(0, "bare", &option_bare, "create a bare repository"),
        OPT_BOOLEAN('n', "no-checkout", &option_no_checkout,
                    "don't create a checkout"),
        OPT_BOOLEAN(0, "bare", &option_bare, "create a bare repository"),

diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 6207ecd2982761a47474b57cc945a2fc66ed84a1..a4d3e90a86be3242cd9d35baa712cce79faec649 100644 (file)
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -736,7 +736,7 @@ static int get_pack(int xd[2], char **pack_lockfile)
        }
        else {
                *av++ = "unpack-objects";
        }
        else {
                *av++ = "unpack-objects";

-               if (args.quiet)
+               if (args.quiet || args.no_progress)

                        *av++ = "-q";
        }
        if (*hdr_arg)
                        *av++ = "-q";
        }
        if (*hdr_arg)

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 0481c169ca5efd71b1b54133c69809507cb3623a..8ec4eae3eb78925de41253264380ea5585b0f091 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -30,7 +30,7 @@ enum {
 };
 
 static int all, append, dry_run, force, keep, multiple, prune, update_head_ok, verbosity;
 };
 
 static int all, append, dry_run, force, keep, multiple, prune, update_head_ok, verbosity;

-static int progress, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
+static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT;

 static int tags = TAGS_DEFAULT;
 static const char *depth;
 static const char *upload_pack;
 static int tags = TAGS_DEFAULT;
 static const char *depth;
 static const char *upload_pack;


@@ -78,7 +78,7 @@ static struct option builtin_fetch_options[] = {
        OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),
        OPT_BOOLEAN('u', "update-head-ok", &update_head_ok,
                    "allow updating of HEAD ref"),
        OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),
        OPT_BOOLEAN('u', "update-head-ok", &update_head_ok,
                    "allow updating of HEAD ref"),

-       OPT_BOOLEAN(0, "progress", &progress, "force progress reporting"),
+       OPT_BOOL(0, "progress", &progress, "force progress reporting"),

        OPT_STRING(0, "depth", &depth, "depth",
                   "deepen history of shallow clone"),
        { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, "dir",
        OPT_STRING(0, "depth", &depth, "depth",
                   "deepen history of shallow clone"),
        { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, "dir",

diff --git a/builtin/push.c b/builtin/push.c
index 35cce532f2bb632e01c0de0a8e6f9e1395eece88..6c373cf28bfc9d8409014d84eef5b886218b25ab 100644 (file)
--- 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 deleterefs;
 static const char *receivepack;
 static int verbosity;

-static int progress;
+static int progress = -1;

 
 static const char **refspec;
 static int refspec_nr;
 
 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_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()
        };
 
                OPT_END()
        };
 

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 71f258ef6e620979a9dbeaa87d2501a304b3a0fa..9df341c793d58eff215805bf5ca5da383f4a99d9 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -58,7 +58,7 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext
                argv[i++] = "--thin";
        if (args->use_ofs_delta)
                argv[i++] = "--delta-base-offset";
                argv[i++] = "--thin";
        if (args->use_ofs_delta)
                argv[i++] = "--delta-base-offset";

-       if (args->quiet)
+       if (args->quiet || !args->progress)

                argv[i++] = "-q";
        if (args->progress)
                argv[i++] = "--progress";
                argv[i++] = "-q";
        if (args->progress)
                argv[i++] = "--progress";


@@ -250,6 +250,7 @@ int send_pack(struct send_pack_args *args,
        int allow_deleting_refs = 0;
        int status_report = 0;
        int use_sideband = 0;
        int allow_deleting_refs = 0;
        int status_report = 0;
        int use_sideband = 0;

+       int quiet_supported = 0;

        unsigned cmds_sent = 0;
        int ret;
        struct async demux;
        unsigned cmds_sent = 0;
        int ret;
        struct async demux;


@@ -263,8 +264,8 @@ int send_pack(struct send_pack_args *args,
                args->use_ofs_delta = 1;
        if (server_supports("side-band-64k"))
                use_sideband = 1;
                args->use_ofs_delta = 1;
        if (server_supports("side-band-64k"))
                use_sideband = 1;

-       if (!server_supports("quiet"))
-               args->quiet = 0;
+       if (server_supports("quiet"))
+               quiet_supported = 1;

 
        if (!remote_refs) {
                fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
 
        if (!remote_refs) {
                fprintf(stderr, "No refs in common and none specified; doing nothing.\n"


@@ -302,17 +303,18 @@ int send_pack(struct send_pack_args *args,
                } else {
                        char *old_hex = sha1_to_hex(ref->old_sha1);
                        char *new_hex = sha1_to_hex(ref->new_sha1);
                } else {
                        char *old_hex = sha1_to_hex(ref->old_sha1);
                        char *new_hex = sha1_to_hex(ref->new_sha1);

+                       int quiet = quiet_supported && (args->quiet || !args->progress);

 
                        if (!cmds_sent && (status_report || use_sideband || args->quiet)) {
                                packet_buf_write(&req_buf, "%s %s %s%c%s%s%s",
 
                        if (!cmds_sent && (status_report || use_sideband || args->quiet)) {
                                packet_buf_write(&req_buf, "%s %s %s%c%s%s%s",

-                                       old_hex, new_hex, ref->name, 0,
-                                       status_report ? " report-status" : "",
-                                       use_sideband ? " side-band-64k" : "",
-                                       args->quiet ? " quiet" : "");
+                                                old_hex, new_hex, ref->name, 0,
+                                                status_report ? " report-status" : "",
+                                                use_sideband ? " side-band-64k" : "",
+                                                quiet ? " quiet" : "");

                        }
                        else
                                packet_buf_write(&req_buf, "%s %s %s",
                        }
                        else
                                packet_buf_write(&req_buf, "%s %s %s",

-                                       old_hex, new_hex, ref->name);
+                                                old_hex, new_hex, ref->name);

                        ref->status = status_report ?
                                REF_STATUS_EXPECTING_REPORT :
                                REF_STATUS_OK;
                        ref->status = status_report ?
                                REF_STATUS_EXPECTING_REPORT :
                                REF_STATUS_OK;

diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
index 9ee52cfc458b2914ee82da6ac1117a2b1ae45a64..3683df13a6ae2208212bd3606187f9876e0562b5 100755 (executable)
--- a/t/t5523-push-upstream.sh
+++ b/t/t5523-push-upstream.sh
@@ -101,10 +101,11 @@ test_expect_success TTY 'push -q suppresses progress' '
        ! grep "Writing objects" err
 '
 
        ! grep "Writing objects" err
 '
 

-test_expect_failure TTY 'push --no-progress suppresses progress' '
+test_expect_success TTY 'push --no-progress suppresses progress' '

        ensure_fresh_upstream &&
 
        test_terminal git push -u --no-progress upstream master >out 2>err &&
        ensure_fresh_upstream &&
 
        test_terminal git push -u --no-progress upstream master >out 2>err &&

+       ! grep "Unpacking objects" err &&

        ! grep "Writing objects" err
 '
 
        ! grep "Writing objects" err
 '
 

diff --git a/transport.c b/transport.c
index cac0c065ff9f82011b204f932932283b01a5d034..401b8dd35ce9acd88f38440fc52b908898119a81 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -993,11 +993,15 @@ void transport_set_verbosity(struct transport *transport, int verbosity,
         * Rules used to determine whether to report progress (processing aborts
         * when a rule is satisfied):
         *
         * Rules used to determine whether to report progress (processing aborts
         * when a rule is satisfied):
         *

-        *   1. Report progress, if force_progress is 1 (ie. --progress).
-        *   2. Don't report progress, if verbosity < 0 (ie. -q/--quiet ).
-        *   3. Report progress if isatty(2) is 1.
+        *   . Report progress, if force_progress is 1 (ie. --progress).
+        *   . Don't report progress, if force_progress is 0 (ie. --no-progress).
+        *   . Don't report progress, if verbosity < 0 (ie. -q/--quiet ).
+        *   . Report progress if isatty(2) is 1.

         **/
         **/

-       transport->progress = force_progress || (verbosity >= 0 && isatty(2));
+       if (force_progress >= 0)
+               transport->progress = !!force_progress;
+       else
+               transport->progress = verbosity >= 0 && isatty(2);

 }
 
 int transport_push(struct transport *transport,
 }
 
 int transport_push(struct transport *transport,