Skip to content

Commit

Permalink
diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value
Browse files Browse the repository at this point in the history
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 <bedhanger@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
bedhanger authored and gitster committed Dec 6, 2017
1 parent b4c02c3 commit 7cb6ac1
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7cb6ac1

Please sign in to comment.