From 7cb6ac1e4b5c58b515ca503c972124e8b5a0d9ee Mon Sep 17 00:00:00 2001 From: Ann T Ropea Date: Sun, 3 Dec 2017 22:27:42 +0100 Subject: diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value Neither Git nor the user are in need of this (visual) aid anymore, but we must offer a transition period. A follow-up patch (series) will rectify the situation by covering the new output format as well as the backward compatible one. Also, fix a typo: "abbbreviated" ---> "abbreviated". Signed-off-by: Ann T Ropea Signed-off-by: Junio C Hamano --- diff.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'diff.c') diff --git a/diff.c b/diff.c index e6814b9e9..8c2bf97cb 100644 --- a/diff.c +++ b/diff.c @@ -4903,14 +4903,20 @@ const char *diff_aligned_abbrev(const struct object_id *oid, int len) int abblen; const char *abbrev; + /* Do we want all 40 hex characters? */ if (len == GIT_SHA1_HEXSZ) return oid_to_hex(oid); + /* An abbreviated value is fine, possibly followed by an ellipsis. */ abbrev = diff_abbrev_oid(oid, len); + + if (!print_sha1_ellipsis()) + return abbrev; + abblen = strlen(abbrev); /* - * In well-behaved cases, where the abbbreviated result is the + * In well-behaved cases, where the abbreviated result is the * same as the requested length, append three dots after the * abbreviation (hence the whole logic is limited to the case * where abblen < 37); when the actual abbreviated result is a -- cgit v1.2.1