diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 11:46:31 -0700 |
| commit | 09f66eb0e2046c99053df6ddddccc2a1c5e64de3 (patch) | |
| tree | 589ee26d3ec1edd8282655acb5696428fcca21a2 | |
| parent | Merge branch 'jk/log-warn-on-bogus-encoding' (diff) | |
| parent | show-branch: simplify rev_is_head() (diff) | |
| download | tgif-09f66eb0e2046c99053df6ddddccc2a1c5e64de3.tar.xz | |
Merge branch 'rs/show-branch-simplify'
Code cleanup.
* rs/show-branch-simplify:
show-branch: simplify rev_is_head()
| -rw-r--r-- | builtin/show-branch.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index d77ce7aeb3..bea4bbf468 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -482,10 +482,9 @@ static void snarf_refs(int head, int remotes) } } -static int rev_is_head(const char *head, const char *name, - unsigned char *head_sha1, unsigned char *sha1) +static int rev_is_head(const char *head, const char *name) { - if (!head || (head_sha1 && sha1 && !hasheq(head_sha1, sha1))) + if (!head) return 0; skip_prefix(head, "refs/heads/", &head); if (!skip_prefix(name, "refs/heads/", &name)) @@ -806,9 +805,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) /* We are only interested in adding the branch * HEAD points at. */ - if (rev_is_head(head, - ref_name[i], - head_oid.hash, NULL)) + if (rev_is_head(head, ref_name[i])) has_head++; } if (!has_head) { @@ -867,10 +864,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) if (1 < num_rev || extra < 0) { for (i = 0; i < num_rev; i++) { int j; - int is_head = rev_is_head(head, - ref_name[i], - head_oid.hash, - rev[i]->object.oid.hash); + int is_head = rev_is_head(head, ref_name[i]) && + oideq(&head_oid, &rev[i]->object.oid); if (extra < 0) printf("%c [%s] ", is_head ? '*' : ' ', ref_name[i]); |