Sync with 1.7.6.2

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

diff --git a/Documentation/RelNotes/1.7.6.2.txt b/Documentation/RelNotes/1.7.6.2.txt
new file mode 100644 (file)
index 0000000..67ae414
--- /dev/null
+++ b/Documentation/RelNotes/1.7.6.2.txt
@@ -0,0 +1,8 @@
+Git v1.7.6.2 Release Notes
+==========================
+
+Fixes since v1.7.6.1
+--------------------
+
+ * v1.7.6.1 broke "git push --quiet"; it used to be a no-op against an old
+   version of Git running on the other end, but v1.7.6.1 made it abort.

diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index a3a1d8eea3ec733d155475f2d6216e1e71245f10..b1f7dc643a0e9b6b232e1c75b39d7f784ab21b4a 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]
-'git-receive-pack' [--quiet] <directory>
+'git-receive-pack' <directory>
 
 DESCRIPTION
 -----------
@@ -35,9 +35,6 @@ are not fast-forwards.
 
 OPTIONS
 -------
---quiet::
-       Print only error messages.
-
 <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]
-'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
 -----------
@@ -45,9 +45,6 @@ OPTIONS
        the remote repository can lose commits; use it with
        care.
 
---quiet::
-       Print only error messages.
-
 --verbose::
        Run verbosely.
 

diff --git a/Documentation/git.txt b/Documentation/git.txt
index d08a8bb4f2bcf106f925346b274740cd7a136de9..651e155d1de0dc7251e6592e867141d9ce841723 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,10 +44,11 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.7.6.1/git.html[documentation for release 1.7.6.1]
+* link:v1.7.6.2/git.html[documentation for release 1.7.6.2]
 
 * release notes for
-  link:RelNotes/1.7.6.1.txt[1.7.6.1].
+  link:RelNotes/1.7.6.2.txt[1.7.6.2],
+  link:RelNotes/1.7.6.1.txt[1.7.6.1],
   link:RelNotes/1.7.6.txt[1.7.6].
 
 * link:v1.7.5.4/git.html[documentation for release 1.7.5.4]

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 60260d0aa93a878968e5ed72a2a77b96c5c0f040..ae164da4d5a7b7a2c87937ba0983126586f1e646 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -669,7 +669,7 @@ static const char *parse_pack_header(struct pack_header *hdr)
 
 static const char *pack_lockfile;
 
-static const char *unpack(int quiet)
+static const char *unpack(void)
 {
        struct pack_header hdr;
        const char *hdr_err;
@@ -684,10 +684,8 @@ static const char *unpack(int quiet)
 
        if (ntohl(hdr.hdr_entries) < unpack_limit) {
                int code, i = 0;
-               const char *unpacker[5];
+               const char *unpacker[4];
                unpacker[i++] = "unpack-objects";
-               if (quiet)
-                       unpacker[i++] = "-q";
                if (receive_fsck_objects)
                        unpacker[i++] = "--strict";
                unpacker[i++] = hdr_arg;
@@ -788,7 +786,6 @@ static void add_alternate_refs(void)
 
 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;
@@ -802,11 +799,6 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
                const char *arg = *argv++;
 
                if (*arg == '-') {
-                       if (!strcmp(arg, "--quiet")) {
-                               quiet = 1;
-                               continue;
-                       }
-
                        if (!strcmp(arg, "--advertise-refs")) {
                                advertise_refs = 1;
                                continue;
@@ -855,7 +847,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
                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);

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;
                        }
-                       if (!strcmp(arg, "--quiet")) {
-                               args.quiet = 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 {
-               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);
-               strbuf_release(&sb);
        }
 
        memset(&extra_have, 0, sizeof(extra_have));

diff --git a/remote-curl.c b/remote-curl.c
index 5798aa57b6bf7f47f4fd9c8b943602faaeee4b95..b8cf45a7dd439b83c80bcf7a397e1b8e34c70f67 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";
-       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++)

diff --git a/transport.c b/transport.c
index d2725e57dcee993b6d969f039179406a863c94b2..fa279d531fe1b99841424080487e685fbe04e5bb 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -483,18 +483,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;
-       struct strbuf sb = STRBUF_INIT;
 
        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);
-       strbuf_release(&sb);
 
        return 0;
 }