diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-20 04:05:50 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-20 04:05:50 +0400 |
| commit | 2e05710a161e6287f239fae42b86b0cb46190834 (patch) | |
| tree | a2dd4d1acc86d20f7888ee4f09f7d54d600ff33e /transport.c | |
| parent | b8fc5abd73e2e81c396844c09e8003de320709e5 (diff) | |
| parent | 8cad4744ee37ebec1d9491a1381ec1771a1ba795 (diff) | |
Merge branch 'nd/resolve-ref'
* nd/resolve-ref:
Rename resolve_ref() to resolve_ref_unsafe()
Convert resolve_ref+xstrdup to new resolve_refdup function
revert: convert resolve_ref() to read_ref_full()
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.c b/transport.c index 51814b5da3..e9797c0fc7 100644 --- a/transport.c +++ b/transport.c @@ -163,7 +163,7 @@ static void set_upstreams(struct transport *transport, struct ref *refs, /* Follow symbolic refs (mainly for HEAD). */ localname = ref->peer_ref->name; remotename = ref->name; - tmp = resolve_ref(localname, sha, 1, &flag); + tmp = resolve_ref_unsafe(localname, sha, 1, &flag); if (tmp && flag & REF_ISSYMREF && !prefixcmp(tmp, "refs/heads/")) localname = tmp; |