From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Mar 2013 20:52:25 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.3-rc0~188
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd04c522bdcecdbea3a3f53d71381bd8f679c580?hp=-c

Merge branch 'maint'

* maint:
Start preparing for 1.8.2.1
transport.c: help gcc 4.6.3 users by squelching compiler warning
---

cd04c522bdcecdbea3a3f53d71381bd8f679c580
diff --combined transport.c
index 6f671c6506,e6f9346c76..42a61b30b3
--- a/transport.c
+++ b/transport.c
@@@ -106,7 -106,8 +106,8 @@@ static void insert_packed_refs(const ch
  		return;
  
  	for (;;) {
- 		int cmp, len;
+ 		int cmp = 0; /* assigned before used */
+ 		int len;
  
  		if (!fgets(buffer, sizeof(buffer), f)) {
  			fclose(f);
@@@ -518,9 -519,11 +519,9 @@@ static int fetch_refs_via_pack(struct t
  			       int nr_heads, struct ref **to_fetch)
  {
  	struct git_transport_data *data = transport->data;
 -	struct string_list sought = STRING_LIST_INIT_DUP;
  	const struct ref *refs;
  	char *dest = xstrdup(transport->url);
  	struct fetch_pack_args args;
 -	int i;
  	struct ref *refs_tmp = NULL;
  
  	memset(&args, 0, sizeof(args));
@@@ -534,6 -537,9 +535,6 @@@
  	args.no_progress = !transport->progress;
  	args.depth = data->options.depth;
  
 -	for (i = 0; i < nr_heads; i++)
 -		string_list_append(&sought, to_fetch[i]->name);
 -
  	if (!data->got_remote_heads) {
  		connect_setup(transport, 0, 0);
  		get_remote_heads(data->fd[0], &refs_tmp, 0, NULL);
@@@ -542,8 -548,7 +543,8 @@@
  
  	refs = fetch_pack(&args, data->fd, data->conn,
  			  refs_tmp ? refs_tmp : transport->remote_refs,
 -			  dest, &sought, &transport->pack_lockfile);
 +			  dest, to_fetch, nr_heads,
 +			  &transport->pack_lockfile);
  	close(data->fd[0]);
  	close(data->fd[1]);
  	if (finish_connect(data->conn))
@@@ -553,6 -558,7 +554,6 @@@
  
  	free_refs(refs_tmp);
  
 -	string_list_clear(&sought, 0);
  	free(dest);
  	return (refs ? 0 : -1);
  }