summaryrefslogtreecommitdiffstats
path: root/tree-diff.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-04-18 01:10:40 +0200
committerJunio C Hamano <gitster@pobox.com>2016-04-25 23:26:28 +0200
commitce6663a9da77c0adc0743e801946dc1a49f4a186 (patch)
treebd0fb10fb8133678b53079732fb54e266dea63b2 /tree-diff.c
parentstruct name_entry: use struct object_id instead of unsigned char sha1[20] (diff)
downloadgit-ce6663a9da77c0adc0743e801946dc1a49f4a186.tar.xz
git-ce6663a9da77c0adc0743e801946dc1a49f4a186.zip
tree-walk: convert tree_entry_extract() to use struct object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-diff.c')
-rw-r--r--tree-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tree-diff.c b/tree-diff.c
index 402f9ff23a..ff4e0d3cb6 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -183,7 +183,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
if (t) {
/* path present in resulting tree */
- sha1 = tree_entry_extract(t, &path, &mode);
+ sha1 = tree_entry_extract(t, &path, &mode)->hash;
pathlen = tree_entry_len(&t->entry);
isdir = S_ISDIR(mode);
} else {