diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-12-19 16:05:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-12-19 16:05:50 -0800 |
commit | 2e05710a161e6287f239fae42b86b0cb46190834 (patch) | |
tree | a2dd4d1acc86d20f7888ee4f09f7d54d600ff33e /builtin/remote.c | |
parent | Merge branch 'jn/maint-sequencer-fixes' (diff) | |
parent | Rename resolve_ref() to resolve_ref_unsafe() (diff) | |
download | tgif-2e05710a161e6287f239fae42b86b0cb46190834.tar.xz |
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 'builtin/remote.c')
-rw-r--r-- | builtin/remote.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index 407abfb0f7..583eec90e0 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -573,7 +573,7 @@ static int read_remote_branches(const char *refname, strbuf_addf(&buf, "refs/remotes/%s/", rename->old); if (!prefixcmp(refname, buf.buf)) { item = string_list_append(rename->remote_branches, xstrdup(refname)); - symref = resolve_ref(refname, orig_sha1, 1, &flag); + symref = resolve_ref_unsafe(refname, orig_sha1, 1, &flag); if (flag & REF_ISSYMREF) item->util = xstrdup(symref); else |