From d6cece51b83db5d8a523c4ba857013c4242e310e Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 20 Oct 2016 02:20:07 -0400 Subject: diff_aligned_abbrev: use "struct oid" Since we're modifying this function anyway, it's a good time to update it to the more modern "struct oid". We can also drop some of the magic numbers in favor of GIT_SHA1_HEXSZ, along with some descriptive comments. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- combine-diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'combine-diff.c') diff --git a/combine-diff.c b/combine-diff.c index b36c2d16bd..59501db99a 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_aligned_abbrev(p->parent[i].oid.hash, + printf(" %s", diff_aligned_abbrev(&p->parent[i].oid, opt->abbrev)); - printf(" %s ", diff_aligned_abbrev(p->oid.hash, opt->abbrev)); + printf(" %s ", diff_aligned_abbrev(&p->oid, opt->abbrev)); } if (opt->output_format & (DIFF_FORMAT_RAW | DIFF_FORMAT_NAME_STATUS)) { -- cgit v1.2.3