diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-12-13 21:17:48 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 09:26:52 -0800 |
| commit | 96ec7b1e708863d0cd6b8e72a986d6f0a1bb64db (patch) | |
| tree | 6957ce802074c55c0973c8533dbd399a314ecc55 /builtin/branch.c | |
| parent | e4776bd936aa162b7f00cb26260dc4a6ca444abb (diff) | |
| download | git-96ec7b1e708863d0cd6b8e72a986d6f0a1bb64db.tar.gz git-96ec7b1e708863d0cd6b8e72a986d6f0a1bb64db.tar.xz | |
Convert resolve_ref+xstrdup to new resolve_refdup function
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index e1e486e4c..c459f0bab 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -104,6 +104,7 @@ static int branch_merged(int kind, const char *name, */ struct commit *reference_rev = NULL; const char *reference_name = NULL; + void *reference_name_to_free = NULL; int merged; if (kind == REF_LOCAL_BRANCH) { @@ -114,11 +115,9 @@ static int branch_merged(int kind, const char *name, branch->merge && branch->merge[0] && branch->merge[0]->dst && - (reference_name = - resolve_ref(branch->merge[0]->dst, sha1, 1, NULL)) != NULL) { - reference_name = xstrdup(reference_name); + (reference_name = reference_name_to_free = + resolve_refdup(branch->merge[0]->dst, sha1, 1, NULL)) != NULL) reference_rev = lookup_commit_reference(sha1); - } } if (!reference_rev) reference_rev = head_rev; @@ -143,7 +142,7 @@ static int branch_merged(int kind, const char *name, " '%s', even though it is merged to HEAD."), name, reference_name); } - free((char *)reference_name); + free(reference_name_to_free); return merged; } @@ -731,10 +730,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix) track = git_branch_track; - head = resolve_ref("HEAD", head_sha1, 0, NULL); + head = resolve_refdup("HEAD", head_sha1, 0, NULL); if (!head) die(_("Failed to resolve HEAD as a valid ref.")); - head = xstrdup(head); if (!strcmp(head, "HEAD")) { detached = 1; } else { |