From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Dec 2011 19:42:37 +0000 (-0800)
Subject: Merge branch 'jk/http-push-to-empty' into maint
X-Git-Tag: v1.7.8.2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b5c12797b442ddf4256332fe4baf709f90bb57a5;p=git.git

Merge branch 'jk/http-push-to-empty' into maint

* jk/http-push-to-empty:
  remote-curl: don't pass back fake refs

Conflicts:
	remote-curl.c
---

b5c12797b442ddf4256332fe4baf709f90bb57a5
diff --cc remote-curl.c
index 6a352de7b,b780ba5ca..48c20b86f
--- a/remote-curl.c
+++ b/remote-curl.c
@@@ -200,7 -200,8 +200,8 @@@ static struct ref *parse_git_refs(struc
  
  	if (start_async(&async))
  		die("cannot start thread to parse advertised refs");
- 	get_remote_heads(async.out, &list, 0, NULL);
 -	get_remote_heads(async.out, &list, 0, NULL,
++	get_remote_heads(async.out, &list,
+ 			for_push ? REF_NORMAL : 0, NULL);
  	close(async.out);
  	if (finish_async(&async))
  		die("ref parsing thread failed");