Skip to content

Commit 7931f38

Browse files
gitstergitster
committed
Merge branch 'master' into next
* master: Update draft release notes to 1.7.7 Git 1.7.6.2 Revert "Merge branch 'cb/maint-quiet-push' into maint"
2 parents be4d245 + 50963ba commit 7931f38

File tree

9 files changed

+27
-42
lines changed

9 files changed

+27
-42
lines changed

‎Documentation/RelNotes/1.7.6.2.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Git v1.7.6.2 Release Notes
2+
==========================
3+
4+
Fixes since v1.7.6.1
5+
--------------------
6+
7+
* v1.7.6.1 broke "git push --quiet"; it used to be a no-op against an old
8+
version of Git running on the other end, but v1.7.6.1 made it abort.

‎Documentation/RelNotes/1.7.7.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ included in this release.
141141
of the branch that is currently checked out updated.
142142
(merge 55c4a67 ci/forbid-unwanted-current-branch-update later to 'maint').
143143

144+
* "git check-ref-format --print" used to parrot a candidate string that
145+
began with a slash (e.g. /refs/heads/master) without stripping it, to make
146+
the result a suitably normalized string the caller can append to "$GIT_DIR/".
147+
(merge f3738c1 mh/check-ref-format-print-normalize later to 'maint').
148+
144149
* "git clone" failed to clone locally from a ".git" file that itself
145150
is not a directory but is a pointer to one.
146151
(merge 9b0ebc7 nd/maint-clone-gitdir later to 'maint').
@@ -161,7 +166,7 @@ included in this release.
161166
--
162167
exec >/var/tmp/1
163168
echo O=$(git describe master)
164-
O=v1.7.7-rc0-174-ga536a9d
169+
O=v1.7.7-rc0-185-gb648557
165170
git log --first-parent --oneline $O..master
166171
echo
167172
git shortlog --no-merges ^maint ^$O master

‎Documentation/git-receive-pack.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ git-receive-pack - Receive what is pushed into the repository
99
SYNOPSIS
1010
--------
1111
[verse]
12-
'git-receive-pack' [--quiet] <directory>
12+
'git-receive-pack' <directory>
1313

1414
DESCRIPTION
1515
-----------
@@ -35,9 +35,6 @@ are not fast-forwards.
3535

3636
OPTIONS
3737
-------
38-
--quiet::
39-
Print only error messages.
40-
4138
<directory>::
4239
The repository to sync into.
4340

‎Documentation/git-send-pack.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ git-send-pack - Push objects over git protocol to another repository
99
SYNOPSIS
1010
--------
1111
[verse]
12-
'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--quiet] [--verbose] [--thin] [<host>:]<directory> [<ref>...]
12+
'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]
1313

1414
DESCRIPTION
1515
-----------
@@ -45,9 +45,6 @@ OPTIONS
4545
the remote repository can lose commits; use it with
4646
care.
4747

48-
--quiet::
49-
Print only error messages.
50-
5148
--verbose::
5249
Run verbosely.
5350

‎Documentation/git.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ unreleased) version of git, that is available from 'master'
4444
branch of the `git.git` repository.
4545
Documentation for older releases are available here:
4646

47-
* link:v1.7.6.1/git.html[documentation for release 1.7.6.1]
47+
* link:v1.7.6.2/git.html[documentation for release 1.7.6.2]
4848

4949
* release notes for
50-
link:RelNotes/1.7.6.1.txt[1.7.6.1].
50+
link:RelNotes/1.7.6.2.txt[1.7.6.2],
51+
link:RelNotes/1.7.6.1.txt[1.7.6.1],
5152
link:RelNotes/1.7.6.txt[1.7.6].
5253

5354
* link:v1.7.5.4/git.html[documentation for release 1.7.5.4]

‎builtin/receive-pack.c‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ static const char *parse_pack_header(struct pack_header *hdr)
669669

670670
static const char *pack_lockfile;
671671

672-
static const char *unpack(int quiet)
672+
static const char *unpack(void)
673673
{
674674
struct pack_header hdr;
675675
const char *hdr_err;
@@ -684,10 +684,8 @@ static const char *unpack(int quiet)
684684

685685
if (ntohl(hdr.hdr_entries) < unpack_limit) {
686686
int code, i = 0;
687-
const char *unpacker[5];
687+
const char *unpacker[4];
688688
unpacker[i++] = "unpack-objects";
689-
if (quiet)
690-
unpacker[i++] = "-q";
691689
if (receive_fsck_objects)
692690
unpacker[i++] = "--strict";
693691
unpacker[i++] = hdr_arg;
@@ -788,7 +786,6 @@ static void add_alternate_refs(void)
788786

789787
int cmd_receive_pack(int argc, const char **argv, const char *prefix)
790788
{
791-
int quiet = 0;
792789
int advertise_refs = 0;
793790
int stateless_rpc = 0;
794791
int i;
@@ -802,11 +799,6 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
802799
const char *arg = *argv++;
803800

804801
if (*arg == '-') {
805-
if (!strcmp(arg, "--quiet")) {
806-
quiet = 1;
807-
continue;
808-
}
809-
810802
if (!strcmp(arg, "--advertise-refs")) {
811803
advertise_refs = 1;
812804
continue;
@@ -855,7 +847,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
855847
const char *unpack_status = NULL;
856848

857849
if (!delete_only(commands))
858-
unpack_status = unpack(quiet);
850+
unpack_status = unpack();
859851
execute_commands(commands, unpack_status);
860852
if (pack_lockfile)
861853
unlink_or_warn(pack_lockfile);

‎builtin/send-pack.c‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -439,10 +439,6 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
439439
args.force_update = 1;
440440
continue;
441441
}
442-
if (!strcmp(arg, "--quiet")) {
443-
args.quiet = 1;
444-
continue;
445-
}
446442
if (!strcmp(arg, "--verbose")) {
447443
args.verbose = 1;
448444
continue;
@@ -492,13 +488,8 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
492488
fd[0] = 0;
493489
fd[1] = 1;
494490
} else {
495-
struct strbuf sb = STRBUF_INIT;
496-
strbuf_addstr(&sb, receivepack);
497-
if (args.quiet)
498-
strbuf_addstr(&sb, " --quiet");
499-
conn = git_connect(fd, dest, sb.buf,
491+
conn = git_connect(fd, dest, receivepack,
500492
args.verbose ? CONNECT_VERBOSE : 0);
501-
strbuf_release(&sb);
502493
}
503494

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

‎remote-curl.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -762,9 +762,7 @@ static int push_git(struct discovery *heads, int nr_spec, char **specs)
762762
argv[argc++] = "--thin";
763763
if (options.dry_run)
764764
argv[argc++] = "--dry-run";
765-
if (options.verbosity < 0)
766-
argv[argc++] = "--quiet";
767-
else if (options.verbosity > 1)
765+
if (options.verbosity > 1)
768766
argv[argc++] = "--verbose";
769767
argv[argc++] = url;
770768
for (i = 0; i < nr_spec; i++)

‎transport.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -483,18 +483,14 @@ static int set_git_option(struct git_transport_options *opts,
483483
static int connect_setup(struct transport *transport, int for_push, int verbose)
484484
{
485485
struct git_transport_data *data = transport->data;
486-
struct strbuf sb = STRBUF_INIT;
487486

488487
if (data->conn)
489488
return 0;
490489

491-
strbuf_addstr(&sb, for_push ? data->options.receivepack :
492-
data->options.uploadpack);
493-
if (for_push && transport->verbose < 0)
494-
strbuf_addstr(&sb, " --quiet");
495-
data->conn = git_connect(data->fd, transport->url, sb.buf,
490+
data->conn = git_connect(data->fd, transport->url,
491+
for_push ? data->options.receivepack :
492+
data->options.uploadpack,
496493
verbose ? CONNECT_VERBOSE : 0);
497-
strbuf_release(&sb);
498494

499495
return 0;
500496
}

0 commit comments

Comments
 (0)