summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2016-09-27 19:11:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-27 21:02:40 (GMT)
commitf937d78553ce22505543580ae7958d9f5ffeeb89 (patch)
treea6344bff6d36dda957aa9f0242ffa8ee47127a8b /wt-status.c
parent92d52fab3af8b1d5231285ac13b364f008d1a886 (diff)
downloadgit-f937d78553ce22505543580ae7958d9f5ffeeb89.zip
git-f937d78553ce22505543580ae7958d9f5ffeeb89.tar.gz
git-f937d78553ce22505543580ae7958d9f5ffeeb89.tar.bz2
use strbuf_add_unique_abbrev() for adding short hashes, part 2
Call strbuf_add_unique_abbrev() to add abbreviated hashes to strbufs instead of taking detours through find_unique_abbrev() and its static buffer. This is shorter and a bit more efficient. 1eb47f167d65d1d305b9c196a1bb40eb96117cb1 already converted six cases, this patch covers three more. A semantic patch for Coccinelle is included for easier checking for new cases that might be introduced in the future. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c
index 39470da..fed83e5 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1326,8 +1326,7 @@ static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
if (!strcmp(cb->buf.buf, "HEAD")) {
/* HEAD is relative. Resolve it to the right reflog entry. */
strbuf_reset(&cb->buf);
- strbuf_addstr(&cb->buf,
- find_unique_abbrev(nsha1, DEFAULT_ABBREV));
+ strbuf_add_unique_abbrev(&cb->buf, nsha1, DEFAULT_ABBREV);
}
return 1;
}