From 7d924c9139e33e7599d7aed0446e634c427a5f15 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Sun, 17 Apr 2016 23:10:39 +0000 Subject: struct name_entry: use struct object_id instead of unsigned char sha1[20] Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- tree-diff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tree-diff.c') diff --git a/tree-diff.c b/tree-diff.c index 4dda9a14ab..402f9ff23a 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -229,7 +229,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p, DIFF_STATUS_ADDED; if (tpi_valid) { - sha1_i = tp[i].entry.sha1; + sha1_i = tp[i].entry.oid->hash; mode_i = tp[i].entry.mode; } else { @@ -270,7 +270,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p, /* same rule as in emitthis */ int tpi_valid = tp && !(tp[i].entry.mode & S_IFXMIN_NEQ); - parents_sha1[i] = tpi_valid ? tp[i].entry.sha1 + parents_sha1[i] = tpi_valid ? tp[i].entry.oid->hash : NULL; } @@ -482,7 +482,7 @@ static struct combine_diff_path *ll_diff_tree_paths( continue; /* diff(t,pi) != ΓΈ */ - if (hashcmp(t.entry.sha1, tp[i].entry.sha1) || + if (oidcmp(t.entry.oid, tp[i].entry.oid) || (t.entry.mode != tp[i].entry.mode)) continue; -- cgit v1.2.3