Revert "Merge branch 'cb/maint-quiet-push' into maint"

This reverts commit ffa69e61d3c5730bd4b65a465efc130b0ef3c7df, reversing
changes made to 4a13c4d14841343d7caad6ed41a152fee550261d.

Adding a new command line option to receive-pack and feed it from
send-pack is not an acceptable way to add features, as there is no
guarantee that your updated send-pack will be talking to updated
receive-pack. New features need to be added via the capability mechanism
negotiated over the protocol.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index d7b68afbc208c0bd067b4073cff75644888b5ea9..459c08598f31fccf1b5db31f2f1cd9680654b389 100644 (file)
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@ -9,7 +9,7 @@ git-receive-pack - Receive what is pushed into the repository
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git-receive-pack' [--quiet] <directory>
+'git-receive-pack' <directory>

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -35,9 +35,6 @@ are not fast-forwards.
 
 OPTIONS
 -------
 
 OPTIONS
 -------

---quiet::
-       Print only error messages.
-

 <directory>::
        The repository to sync into.
 
 <directory>::
        The repository to sync into.
 

diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index bed9e1f097d3aa144a62765129bf3b599d365dcf..bd3eaa69bfb6e788d297b3e7d2c871d25a478f80 100644 (file)
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -9,7 +9,7 @@ git-send-pack - Push objects over git protocol to another repository
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--quiet] [--verbose] [--thin] [<host>:]<directory> [<ref>...]
+'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -45,9 +45,6 @@ OPTIONS
        the remote repository can lose commits; use it with
        care.
 
        the remote repository can lose commits; use it with
        care.
 

---quiet::
-       Print only error messages.
-

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

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 0d51bfb79eb3e8b234ca4ee98844de20d46503b6..e1a687ad0761e46f6ec95659bb585b9014d4abf4 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -636,7 +636,7 @@ static const char *parse_pack_header(struct pack_header *hdr)
 
 static const char *pack_lockfile;
 
 
 static const char *pack_lockfile;
 

-static const char *unpack(int quiet)
+static const char *unpack(void)

 {
        struct pack_header hdr;
        const char *hdr_err;
 {
        struct pack_header hdr;
        const char *hdr_err;


@@ -651,10 +651,8 @@ static const char *unpack(int quiet)
 
        if (ntohl(hdr.hdr_entries) < unpack_limit) {
                int code, i = 0;
 
        if (ntohl(hdr.hdr_entries) < unpack_limit) {
                int code, i = 0;

-               const char *unpacker[5];
+               const char *unpacker[4];

                unpacker[i++] = "unpack-objects";
                unpacker[i++] = "unpack-objects";

-               if (quiet)
-                       unpacker[i++] = "-q";

                if (receive_fsck_objects)
                        unpacker[i++] = "--strict";
                unpacker[i++] = hdr_arg;
                if (receive_fsck_objects)
                        unpacker[i++] = "--strict";
                unpacker[i++] = hdr_arg;


@@ -755,7 +753,6 @@ static void add_alternate_refs(void)
 
 int cmd_receive_pack(int argc, const char **argv, const char *prefix)
 {
 
 int cmd_receive_pack(int argc, const char **argv, const char *prefix)
 {

-       int quiet = 0;

        int advertise_refs = 0;
        int stateless_rpc = 0;
        int i;
        int advertise_refs = 0;
        int stateless_rpc = 0;
        int i;


@@ -769,11 +766,6 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
                const char *arg = *argv++;
 
                if (*arg == '-') {
                const char *arg = *argv++;
 
                if (*arg == '-') {

-                       if (!strcmp(arg, "--quiet")) {
-                               quiet = 1;
-                               continue;
-                       }
-

                        if (!strcmp(arg, "--advertise-refs")) {
                                advertise_refs = 1;
                                continue;
                        if (!strcmp(arg, "--advertise-refs")) {
                                advertise_refs = 1;
                                continue;


@@ -822,7 +814,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
                const char *unpack_status = NULL;
 
                if (!delete_only(commands))
                const char *unpack_status = NULL;
 
                if (!delete_only(commands))

-                       unpack_status = unpack(quiet);
+                       unpack_status = unpack();

                execute_commands(commands, unpack_status);
                if (pack_lockfile)
                        unlink_or_warn(pack_lockfile);
                execute_commands(commands, unpack_status);
                if (pack_lockfile)
                        unlink_or_warn(pack_lockfile);

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 40a1675997cee19afb77b94bdd514fb5bc9a27bc..c1f6ddd927d61fbc2558ee3624224af405d918c3 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -439,10 +439,6 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                                args.force_update = 1;
                                continue;
                        }
                                args.force_update = 1;
                                continue;
                        }

-                       if (!strcmp(arg, "--quiet")) {
-                               args.quiet = 1;
-                               continue;
-                       }

                        if (!strcmp(arg, "--verbose")) {
                                args.verbose = 1;
                                continue;
                        if (!strcmp(arg, "--verbose")) {
                                args.verbose = 1;
                                continue;


@@ -492,13 +488,8 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                fd[0] = 0;
                fd[1] = 1;
        } else {
                fd[0] = 0;
                fd[1] = 1;
        } else {

-               struct strbuf sb = STRBUF_INIT;
-               strbuf_addstr(&sb, receivepack);
-               if (args.quiet)
-                       strbuf_addstr(&sb, " --quiet");
-               conn = git_connect(fd, dest, sb.buf,
+               conn = git_connect(fd, dest, receivepack,

                        args.verbose ? CONNECT_VERBOSE : 0);
                        args.verbose ? CONNECT_VERBOSE : 0);

-               strbuf_release(&sb);

        }
 
        memset(&extra_have, 0, sizeof(extra_have));
        }
 
        memset(&extra_have, 0, sizeof(extra_have));

diff --git a/remote-curl.c b/remote-curl.c
index 6d3aff62daae382c2ae08c1f829208665ad5715a..69831e931af1fe2a3e668239e8c4bb73a7bfb936 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -762,9 +762,7 @@ static int push_git(struct discovery *heads, int nr_spec, char **specs)
                argv[argc++] = "--thin";
        if (options.dry_run)
                argv[argc++] = "--dry-run";
                argv[argc++] = "--thin";
        if (options.dry_run)
                argv[argc++] = "--dry-run";

-       if (options.verbosity < 0)
-               argv[argc++] = "--quiet";
-       else if (options.verbosity > 1)
+       if (options.verbosity > 1)

                argv[argc++] = "--verbose";
        argv[argc++] = url;
        for (i = 0; i < nr_spec; i++)
                argv[argc++] = "--verbose";
        argv[argc++] = url;
        for (i = 0; i < nr_spec; i++)

diff --git a/transport.c b/transport.c
index 98c577804f177b1c6f9df0e34e5fc3a656a81d27..c9c8056f9de69bd378cd271d70363b5560f13e07 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -482,18 +482,14 @@ static int set_git_option(struct git_transport_options *opts,
 static int connect_setup(struct transport *transport, int for_push, int verbose)
 {
        struct git_transport_data *data = transport->data;
 static int connect_setup(struct transport *transport, int for_push, int verbose)
 {
        struct git_transport_data *data = transport->data;

-       struct strbuf sb = STRBUF_INIT;

 
        if (data->conn)
                return 0;
 
 
        if (data->conn)
                return 0;
 

-       strbuf_addstr(&sb, for_push ? data->options.receivepack :
-                                data->options.uploadpack);
-       if (for_push && transport->verbose < 0)
-               strbuf_addstr(&sb, " --quiet");
-       data->conn = git_connect(data->fd, transport->url, sb.buf,
+       data->conn = git_connect(data->fd, transport->url,
+                                for_push ? data->options.receivepack :
+                                data->options.uploadpack,

                                 verbose ? CONNECT_VERBOSE : 0);
                                 verbose ? CONNECT_VERBOSE : 0);

-       strbuf_release(&sb);

 
        return 0;
 }
 
        return 0;
 }