From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Nov 2013 20:25:28 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.5-rc3~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/33da0c9c3c2ec2706c80f70226739f14a66baa21?hp=-c

Merge branch 'maint'

Hotfix for recent regression while talking to upload-pack
in a repository with many symbolic refs.

* maint:
Revert "upload-pack: send non-HEAD symbolic refs"
---

33da0c9c3c2ec2706c80f70226739f14a66baa21
diff --combined upload-pack.c
index 43342ac161,a020d30480..c989a737f9
--- a/upload-pack.c
+++ b/upload-pack.c
@@@ -10,7 -10,6 +10,7 @@@
  #include "revision.h"
  #include "list-objects.h"
  #include "run-command.h"
 +#include "connect.h"
  #include "sigchain.h"
  #include "version.h"
  #include "string-list.h"
@@@ -753,7 -752,6 +753,6 @@@ static void upload_pack(void
  	struct string_list symref = STRING_LIST_INIT_DUP;
  
  	head_ref_namespaced(find_symref, &symref);
- 	for_each_namespaced_ref(find_symref, &symref);
  
  	if (advertise_refs || !stateless_rpc) {
  		reset_timeout();