tag: add --column

diff --git a/builtin/push.c b/builtin/push.c
index 5fb98a009401e2d790413c20c6a9704ce7b0b007..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 progress;
+static int progress = -1;
 
 static const char **refspec;
 static int refspec_nr;
@@ -204,13 +204,11 @@ static int do_push(const char *repo, int flags)
                url_nr = remote->url_nr;
        }
        if (url_nr) {
-               const char *configured_foreign_vcs = remote->foreign_vcs;
                for (i = 0; i < url_nr; i++) {
                        struct transport *transport =
                                transport_get(remote, url[i]);
                        if (push_with_options(transport, flags))
                                errs++;
-                       remote->foreign_vcs = configured_foreign_vcs;
                }
        } else {
                struct transport *transport =
@@ -262,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()
        };