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/show-branch.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/show-branch.c')
| -rw-r--r-- | builtin/show-branch.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 4b480d7c7c..a59e088cf5 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -726,10 +726,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) if (ac == 0) { static const char *fake_av[2]; - const char *refname; - refname = resolve_ref("HEAD", sha1, 1, NULL); - fake_av[0] = xstrdup(refname); + fake_av[0] = resolve_refdup("HEAD", sha1, 1, NULL); fake_av[1] = NULL; av = fake_av; ac = 1; @@ -791,7 +789,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) } } - head_p = resolve_ref("HEAD", head_sha1, 1, NULL); + head_p = resolve_ref_unsafe("HEAD", head_sha1, 1, NULL); if (head_p) { head_len = strlen(head_p); memcpy(head, head_p, head_len + 1); |