summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-10-20 06:20:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-26 20:30:51 (GMT)
commitd6cece51b83db5d8a523c4ba857013c4242e310e (patch)
tree00026cf8d8f9e753c8dad349955d65b71c210e36 /combine-diff.c
parentd5e3b01e5bd6b06c06dbd5d1e2257d57e6b1deb7 (diff)
downloadgit-d6cece51b83db5d8a523c4ba857013c4242e310e.zip
git-d6cece51b83db5d8a523c4ba857013c4242e310e.tar.gz
git-d6cece51b83db5d8a523c4ba857013c4242e310e.tar.bz2
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c
index b36c2d1..59501db 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)) {