undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with 1.7.6.2

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-09-06 11:42:12 -07:00
commit 48f36dcd73
8 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/RelNotes/1.7.6.2.txt Normal file
View File

@ -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.

5
Documentation/git-receive-pack.txt
View File

@ -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.

5
Documentation/git-send-pack.txt
View File

@ -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.

5
Documentation/git.txt
View File

@ -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]

14
builtin/receive-pack.c
View File

@ -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);

11
builtin/send-pack.c
View File

@ -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));

4
remote-curl.c
View File

@ -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++)

10
transport.c
View File

@ -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;
}