diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-17 13:25:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-17 13:25:21 -0700 |
| commit | 69e6544998892a2bd3c785cd238c786da40cf6a3 (patch) | |
| tree | 5226289723f43db878429658b27a89b4ad23ee57 /wt-status.c | |
| parent | Merge branch 'js/regexec-buf' (diff) | |
| parent | use strbuf_add_unique_abbrev() for adding short hashes, part 3 (diff) | |
| download | tgif-69e6544998892a2bd3c785cd238c786da40cf6a3.tar.xz | |
Merge branch 'rs/cocci'
Code cleanup.
* rs/cocci:
use strbuf_add_unique_abbrev() for adding short hashes, part 3
remove unnecessary NULL check before free(3)
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/wt-status.c b/wt-status.c index 99d1b0a818..ca5c45f945 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1110,7 +1110,6 @@ static void abbrev_sha1_in_line(struct strbuf *line) split = strbuf_split_max(line, ' ', 3); if (split[0] && split[1]) { unsigned char sha1[20]; - const char *abbrev; /* * strbuf_split_max left a space. Trim it and re-add @@ -1118,9 +1117,10 @@ static void abbrev_sha1_in_line(struct strbuf *line) */ strbuf_trim(split[1]); if (!get_sha1(split[1]->buf, sha1)) { - abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV); strbuf_reset(split[1]); - strbuf_addf(split[1], "%s ", abbrev); + strbuf_add_unique_abbrev(split[1], sha1, + DEFAULT_ABBREV); + strbuf_addch(split[1], ' '); strbuf_reset(line); for (i = 0; split[i]; i++) strbuf_addbuf(line, split[i]); @@ -1343,10 +1343,8 @@ static char *get_branch(const struct worktree *wt, const char *path) else if (starts_with(sb.buf, "refs/")) ; else if (!get_sha1_hex(sb.buf, sha1)) { - const char *abbrev; - abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV); strbuf_reset(&sb); - strbuf_addstr(&sb, abbrev); + strbuf_add_unique_abbrev(&sb, sha1, DEFAULT_ABBREV); } else if (!strcmp(sb.buf, "detached HEAD")) /* rebase */ goto got_nothing; else /* bisect */ |