X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-index.c;h=e376d65f800c2b554308b60925eb0042d8f21cec;hb=8eef8e09cee1691faad2159ebdab7ca3b232d26b;hp=c9a9f4c74d96ea22b2a6c4c7593bccc3d5396457;hpb=f51248eb482a7a0feacb04d02119c94d35845975;p=git.git

diff --git a/diff-index.c b/diff-index.c
index c9a9f4c7..e376d65f 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;
@@ -32,12 +33,10 @@ static int get_stat_data(struct cache_entry *ce,
 			}
 			return -1;
 		}
-		changed = ce_match_stat(ce, &st);
+		changed = ce_match_stat(ce, &st, 0);
 		if (changed) {
 			mode = create_ce_mode(st.st_mode);
-			if (!trust_executable_bit &&
-			    S_ISREG(mode) && S_ISREG(ce->ce_mode) &&
-			    ((mode ^ ce->ce_mode) == 0111))
+			if (!trust_executable_bit && S_ISREG(st.st_mode))
 				mode = ce->ce_mode;
 			sha1 = no_sha1;
 		}
@@ -116,7 +115,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 +173,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];
@@ -201,6 +199,14 @@ int main(int argc, const char **argv)
 			/* We accept the -r flag just to look like git-diff-tree */
 			continue;
 		}
+		if (!strcmp(arg, "--cc"))
+			/*
+			 * I _think_ "diff-index --cached HEAD" with an
+			 * unmerged index could show something else
+			 * later, but pretend --cc is the same as -p for
+			 * now.  "git diff" uses --cc by default.
+			 */
+			argv[i] = arg = "-p";
 		diff_opt_cnt = diff_opt_parse(&diff_options, argv + i,
 					      argc - i);
 		if (diff_opt_cnt < 0)
@@ -233,10 +239,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);