projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c719ff
d336572
)
Merge branch 'cb/push-quiet' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 6 Feb 2012 07:58:42 +0000
(23:58 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 6 Feb 2012 07:58:42 +0000
(23:58 -0800)
* cb/push-quiet:
t5541: avoid TAP test miscounting
fix push --quiet: add 'quiet' capability to receive-pack
server_supports(): parse feature list more carefully
1
2
builtin/receive-pack.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
builtin/receive-pack.c
index 8c9e91e78c95a4a3d581aae59d0f00bc95b2c942,31d17cf198d778f4ce5c5c49e74790f8c25f3681..fa7448be5aaf9d2830168b77f9a555e9b6740993
---
1
/
builtin/receive-pack.c
---
2
/
builtin/receive-pack.c
+++ b/
builtin/receive-pack.c
@@@
-122,12
-123,13
+123,12
@@@
static void show_ref(const char *path,
else
packet_write(1, "%s %s%c%s%s\n",
sha1_to_hex(sha1), path, 0,
- " report-status delete-refs side-band-64k",
+ " report-status delete-refs side-band-64k
quiet
",
prefer_ofs_delta ? " ofs-delta" : "");
sent_capabilities = 1;
- return 0;
}
-static int show_ref_cb(const char *path, const unsigned char *sha1, int flag, void *
cb_data
)
+static int show_ref_cb(const char *path, const unsigned char *sha1, int flag, void *
unused
)
{
path = strip_namespace(path);
/*