diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-12-20 00:05:50 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-12-20 00:05:50 (GMT) |
commit | 2e05710a161e6287f239fae42b86b0cb46190834 (patch) | |
tree | a2dd4d1acc86d20f7888ee4f09f7d54d600ff33e /builtin/for-each-ref.c | |
parent | b8fc5abd73e2e81c396844c09e8003de320709e5 (diff) | |
parent | 8cad4744ee37ebec1d9491a1381ec1771a1ba795 (diff) | |
download | git-2e05710a161e6287f239fae42b86b0cb46190834.zip git-2e05710a161e6287f239fae42b86b0cb46190834.tar.gz git-2e05710a161e6287f239fae42b86b0cb46190834.tar.bz2 |
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/for-each-ref.c')
-rw-r--r-- | builtin/for-each-ref.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index d90e5d2..b01d76a 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -628,11 +628,8 @@ static void populate_value(struct refinfo *ref) if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) { unsigned char unused1[20]; - const char *symref; - symref = resolve_ref(ref->refname, unused1, 1, NULL); - if (symref) - ref->symref = xstrdup(symref); - else + ref->symref = resolve_refdup(ref->refname, unused1, 1, NULL); + if (!ref->symref) ref->symref = ""; } |