mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff_unique_abbrev: rename to diff_aligned_abbrev

Browse Source 
The word "align" describes how the function actually differs
from find_unique_abbrev, and will make it less confusing
when we add more diff-specific abbrevation functions that do
not do this alignment.

Since this is a globally available function, let's also move
its descriptive comment to the header file, where we
typically document function interfaces.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2016-10-20 02:19:43 -04:00
committed by Junio C Hamano
parent ef2ed5013c
commit d5e3b01e5b
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
combine-diff.c
View File

@ -1203,9 +1203,9 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re
/* Show sha1's */
for (i = 0; i < num_parent; i++)
printf(" %s", diff_unique_abbrev(p->parent[i].oid.hash,
opt->abbrev));
printf(" %s ", diff_unique_abbrev(p->oid.hash, opt->abbrev));
printf(" %s", diff_aligned_abbrev(p->parent[i].oid.hash,
opt->abbrev));
printf(" %s ", diff_aligned_abbrev(p->oid.hash, opt->abbrev));
}
if (opt->output_format & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) {