[PATCH] Clean up find_unique_abbrev() callers
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 2, 2008, 07:49 UTC
- Message-ID
- <7vy791sgzt.fsf_-_@gitster.siamese.dyndns.org>
- In-Reply-To
- <20080301050641.GB8969@coredump.intra.peff.net>
Now find_unique_abbrev() never returns NULL, there is no need for callers to prepare for seeing NULL and fall back to giving the full 40 hexdigits.
While we are at it, drop "..." in the "git reset" output that reports the location of the new HEAD, between the abbreviated commit object name and the one line commit summary. Because we are always showing the HEAD (which cannot be missing!), we never had a case where we show the full 40 hexdigits that is not followed by three dots, and these three dots were stealing 3 columns from the precious horizontal screen real estate out of 80 that can better be used for the one line commit summary.
Signed-off-by: Junio C Hamano <gitster@pobox.com> ---
builtin-reset.c | 8 ++------ builtin-send-pack.c | 4 +--- diff.c | 2 -- 3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/builtin-reset.c b/builtin-reset.c index af0037e..bb3e192 100644 --- a/builtin-reset.c +++ b/builtin-reset.c @@ -63,14 +63,10 @@ static int reset_index_file(const unsigned char *sha1, int is_hard_reset) static void print_new_head_line(struct commit *commit) { - const char *hex, *dots = "...", *body; + const char *hex, *body; hex = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV); - if (!hex) { - hex = sha1_to_hex(commit->object.sha1); - dots = ""; - } - printf("HEAD is now at %s%s", hex, dots); + printf("HEAD is now at %s", hex); body = strstr(commit->buffer, "\n\n"); if (body) { const char *eol; diff --git a/builtin-send-pack.c b/builtin-send-pack.c index b0cfae8..930e0fb 100644 --- a/builtin-send-pack.c +++ b/builtin-send-pack.c @@ -264,9 +264,7 @@ static void print_ref_status(char flag, const char *summary, struct ref *to, str static const char *status_abbrev(unsigned char sha1[20]) { - const char *abbrev; - abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV); - return abbrev ? abbrev : sha1_to_hex(sha1); + return find_unique_abbrev(sha1, DEFAULT_ABBREV); } static void print_ok_ref_status(struct ref *ref) diff --git a/diff.c b/diff.c index ad16164..b80f656 100644 --- a/diff.c +++ b/diff.c @@ -2581,8 +2581,6 @@ const char *diff_unique_abbrev(const unsigned char *sha1, int len) return sha1_to_hex(sha1); abbrev = find_unique_abbrev(sha1, len); - if (!abbrev) - return sha1_to_hex(sha1); abblen = strlen(abbrev); if (abblen < 37) { static char hex[41];