X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff-index.c;h=bbd873ba13306ed87f89ea5a4315bfe7ce794c7e;hb=5290a0f8129cc5830390bad3cc6c8034cb23b41c;hp=c9a9f4c74d96ea22b2a6c4c7593bccc3d5396457;hpb=29504118f8528f658fd0bfc02d8d78d4c01dc2cc;p=git.git

diff --git a/diff-index.c b/diff-index.c
index c9a9f4c74..bbd873ba1 100644
--- a/diff-index.c
+++ b/diff-index.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "tree.h"
 #include "diff.h"
 
 static int cached_only = 0;
@@ -116,7 +117,7 @@ static int diff_cache(struct cache_entry **ac, int entries, const char **pathspe
 			/* We come here with ce pointing at stage 1
 			 * (original tree) and ac[1] pointing at stage
 			 * 3 (unmerged).  show-modified with
-			 * report-mising set to false does not say the
+			 * report-missing set to false does not say the
 			 * file is deleted but reports true if work
 			 * tree does not have it, in which case we
 			 * fall through to report the unmerged state.
@@ -174,13 +175,12 @@ int main(int argc, const char **argv)
 	unsigned char sha1[20];
 	const char *prefix = setup_git_directory();
 	const char **pathspec = NULL;
-	void *tree;
-	unsigned long size;
+	struct tree *tree;
 	int ret;
 	int allow_options = 1;
 	int i;
 
-	git_config(git_default_config);
+	git_config(git_diff_config);
 	diff_setup(&diff_options);
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
@@ -233,10 +233,10 @@ int main(int argc, const char **argv)
 
 	mark_merge_entries();
 
-	tree = read_object_with_reference(sha1, "tree", &size, NULL);
+	tree = parse_tree_indirect(sha1);
 	if (!tree)
 		die("bad tree object %s", tree_name);
-	if (read_tree(tree, size, 1, pathspec))
+	if (read_tree(tree, 1, pathspec))
 		die("unable to read tree object %s", tree_name);
 
 	ret = diff_cache(active_cache, active_nr, pathspec);