diff options
| author | René Scharfe <l.s.r@web.de> | 2016-08-06 17:41:01 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-06 10:33:57 -0700 |
| commit | 1eb47f167d65d1d305b9c196a1bb40eb96117cb1 (patch) | |
| tree | b4070ff9aaae093d223b19813e4732dcccdd258a /transport.c | |
| parent | 08df31eeccfe1576971ea4ba42570a424c3cfc41 (diff) | |
| download | git-1eb47f167d65d1d305b9c196a1bb40eb96117cb1.tar.gz | |
use strbuf_add_unique_abbrev() for adding short hashesrs/use-strbuf-add-unique-abbrev
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.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/transport.c b/transport.c index 095e61f0ad..7ef84b9820 100644 --- a/transport.c +++ b/transport.c @@ -321,11 +321,6 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, str } } -static const char *status_abbrev(unsigned char sha1[20]) -{ - return find_unique_abbrev(sha1, DEFAULT_ABBREV); -} - static void print_ok_ref_status(struct ref *ref, int porcelain) { if (ref->deletion) @@ -340,7 +335,8 @@ static void print_ok_ref_status(struct ref *ref, int porcelain) char type; const char *msg; - strbuf_addstr(&quickref, status_abbrev(ref->old_oid.hash)); + strbuf_add_unique_abbrev(&quickref, ref->old_oid.hash, + DEFAULT_ABBREV); if (ref->forced_update) { strbuf_addstr(&quickref, "..."); type = '+'; @@ -350,7 +346,8 @@ static void print_ok_ref_status(struct ref *ref, int porcelain) type = ' '; msg = NULL; } - strbuf_addstr(&quickref, status_abbrev(ref->new_oid.hash)); + strbuf_add_unique_abbrev(&quickref, ref->new_oid.hash, + DEFAULT_ABBREV); print_ref_status(type, quickref.buf, ref, ref->peer_ref, msg, porcelain); strbuf_release(&quickref); |