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

diff --cc remote-curl.c
index 6a352de7be33c48134842a8ffbb86883b5d69812,b780ba5ca8c713b7231835df8a63e452b41a0598..48c20b86f3cfc6c189972718046a6890aaefacf3
--- 1/remote-curl.c
--- 2/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");