summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-06-17 17:15:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-17 17:15:15 (GMT)
commit86d87307c1c490282749e278380b9a258de0b46c (patch)
treeeeac81ad5d3611520950f7ac59229c2033e23fcb /upload-pack.c
parent63b6b4b7e107d5b40620d0b3dc3efff0284dfb7b (diff)
parent533e088250cf4e8aad3143586850d7a89ed30571 (diff)
downloadgit-86d87307c1c490282749e278380b9a258de0b46c.zip
git-86d87307c1c490282749e278380b9a258de0b46c.tar.gz
git-86d87307c1c490282749e278380b9a258de0b46c.tar.bz2
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
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 2429891..4d2129e 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1037,8 +1037,8 @@ static int find_symref(const char *refname, const struct object_id *oid,
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;
}