diff options
| author | Jeff King <peff@peff.net> | 2016-10-20 02:19:43 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:30:51 -0700 |
| commit | d5e3b01e5bd6b06c06dbd5d1e2257d57e6b1deb7 (patch) | |
| tree | 696f1117d12b676c167fbc459d0937f6f997711e /combine-diff.c | |
| parent | ef2ed5013c4160284d9de18903bd4f7d0542d810 (diff) | |
| download | git-d5e3b01e5bd6b06c06dbd5d1e2257d57e6b1deb7.tar.gz | |
diff_unique_abbrev: rename to diff_aligned_abbrev
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>
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/combine-diff.c b/combine-diff.c index 8e2a577bdb..b36c2d16bd 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -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)) { |