From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Aug 2018 22:08:28 +0000 (-0700)
Subject: Merge branch 'jt/connectivity-check-after-unshallow'
X-Git-Tag: v2.19.0-rc0~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b160b6e69d5e8231cf71b3bcacef63443849d1f9;p=thirdparty%2Fgit.git

Merge branch 'jt/connectivity-check-after-unshallow'

"git fetch" sometimes failed to update the remote-tracking refs,
which has been corrected.

* jt/connectivity-check-after-unshallow:
  fetch-pack: unify ref in and out param
---

b160b6e69d5e8231cf71b3bcacef63443849d1f9
diff --cc fetch-pack.c
index 1ab0b2d37e,660259e6b2..f80a7acdf3
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@@ -1284,20 -1345,20 +1285,20 @@@ static void receive_wanted_refs(struct 
  	while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
  		struct object_id oid;
  		const char *end;
- 		struct ref *r = NULL;
+ 		int i;
  
  		if (parse_oid_hex(reader->line, &oid, &end) || *end++ != ' ')
 -			die("expected wanted-ref, got '%s'", reader->line);
 +			die(_("expected wanted-ref, got '%s'"), reader->line);
  
- 		for (r = refs; r; r = r->next) {
- 			if (!strcmp(end, r->name)) {
- 				oidcpy(&r->old_oid, &oid);
+ 		for (i = 0; i < nr_sought; i++) {
+ 			if (!strcmp(end, sought[i]->name)) {
+ 				oidcpy(&sought[i]->old_oid, &oid);
  				break;
  			}
  		}
  
- 		if (!r)
+ 		if (i == nr_sought)
 -			die("unexpected wanted-ref: '%s'", reader->line);
 +			die(_("unexpected wanted-ref: '%s'"), reader->line);
  	}
  
  	if (reader->status != PACKET_READ_DELIM)