From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Feb 2012 07:58:42 +0000 (-0800)
Subject: Merge branch 'cb/push-quiet' into maint
X-Git-Tag: v1.7.9.1~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4802997c7531835f16b6fce690854d9a75119d0b;p=git.git

Merge branch 'cb/push-quiet' into maint

* cb/push-quiet:
  t5541: avoid TAP test miscounting
  fix push --quiet: add 'quiet' capability to receive-pack
  server_supports(): parse feature list more carefully
---

4802997c7531835f16b6fce690854d9a75119d0b
diff --cc builtin/receive-pack.c
index 8c9e91e78,31d17cf19..fa7448be5
--- a/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);
  	/*