From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Jun 2019 17:15:15 +0000 (-0700)
Subject: Merge branch 'jk/HEAD-symref-in-xfer-namespaces'
X-Git-Tag: v2.23.0-rc0~122
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/86d87307c1c490282749e278380b9a258de0b46c?hp=-c

Merge branch 'jk/HEAD-symref-in-xfer-namespaces'

The server side support for "git fetch" used to show incorrect
value for the HEAD symbolic ref when the namespace feature is in
use, which has been corrected.

* jk/HEAD-symref-in-xfer-namespaces:
upload-pack: strip namespace from symref data
---

86d87307c1c490282749e278380b9a258de0b46c
diff --combined upload-pack.c
index 24298913c0,7fa501cb4d..4d2129e7fc
--- a/upload-pack.c
+++ b/upload-pack.c
@@@ -592,8 -592,7 +592,8 @@@ error
  	return 1;
  }
  
 -static void check_non_tip(struct object_array *want_obj)
 +static void check_non_tip(struct object_array *want_obj,
 +			  struct packet_writer *writer)
  {
  	int i;
  
@@@ -612,13 -611,9 +612,13 @@@ error
  	/* Pick one of them (we know there at least is one) */
  	for (i = 0; i < want_obj->nr; i++) {
  		struct object *o = want_obj->objects[i].item;
 -		if (!is_our_ref(o))
 +		if (!is_our_ref(o)) {
 +			packet_writer_error(writer,
 +					    "upload-pack: not our ref %s",
 +					    oid_to_hex(&o->oid));
  			die("git upload-pack: not our ref %s",
  			    oid_to_hex(&o->oid));
 +		}
  	}
  }
  
@@@ -839,7 -834,7 +839,7 @@@ static int process_deepen_not(const cha
  	if (skip_prefix(line, "deepen-not ", &arg)) {
  		char *ref = NULL;
  		struct object_id oid;
 -		if (expand_ref(arg, strlen(arg), &oid, &ref) != 1)
 +		if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1)
  			die("git upload-pack: ambiguous deepen-not: %s", line);
  		string_list_append(deepen_not, ref);
  		free(ref);
@@@ -941,7 -936,7 +941,7 @@@ static void receive_needs(struct packet
  	 * by another process that handled the initial request.
  	 */
  	if (has_non_tip)
 -		check_non_tip(want_obj);
 +		check_non_tip(want_obj, &writer);
  
  	if (!use_sideband && daemon_mode)
  		no_progress = 1;
@@@ -1037,8 -1032,8 +1037,8 @@@ static int find_symref(const char *refn
  	symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
  	if (!symref_target || (flag & REF_ISSYMREF) == 0)
  		die("'%s' is a symref but it is not?", refname);
- 	item = string_list_append(cb_data, refname);
- 	item->util = xstrdup(symref_target);
+ 	item = string_list_append(cb_data, strip_namespace(refname));
+ 	item->util = xstrdup(strip_namespace(symref_target));
  	return 0;
  }
  
@@@ -1069,8 -1064,6 +1069,8 @@@ static int upload_pack_config(const cha
  		allow_ref_in_want = git_config_bool(var, value);
  	} else if (!strcmp("uploadpack.allowsidebandall", var)) {
  		allow_sideband_all = git_config_bool(var, value);
 +	} else if (!strcmp("core.precomposeunicode", var)) {
 +		precomposed_unicode = git_config_bool(var, value);
  	}
  
  	if (current_config_scope() != CONFIG_SCOPE_REPO) {