From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Feb 2018 21:39:07 +0000 (-0800)
Subject: Merge branch 'rs/describe-unique-abbrev'
X-Git-Tag: v2.17.0-rc0~127
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8fe806bcd5ac621e22982c73306e94d26e56cf79?hp=ab5a940debf4cd1b35b1d7d6eec7afe645d3b46a

Merge branch 'rs/describe-unique-abbrev'

Code clean-up.

* rs/describe-unique-abbrev:
describe: use strbuf_add_unique_abbrev() for adding short hashes
---

diff --git a/builtin/describe.c b/builtin/describe.c
index 6fe1c51281..c428984706 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -383,7 +383,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
 	if (!match_cnt) {
 		struct object_id *cmit_oid = &cmit->object.oid;
 		if (always) {
-			strbuf_addstr(dst, find_unique_abbrev(cmit_oid->hash, abbrev));
+			strbuf_add_unique_abbrev(dst, cmit_oid->hash, abbrev);
 			if (suffix)
 				strbuf_addstr(dst, suffix);
 			return;