X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-files.c;h=ffbef48b2e05869a0a74ea7df53ee80106aa81b3;hb=a549e11cc2fee10ddf66dd98ea79f7c624eee34e;hp=4cafd3ea20080c408ffba1584202e8feb6d53764;hpb=36b5b3c65948694d9a92de5a17f2b97c3cd84879;p=git.git

diff --git a/diff-files.c b/diff-files.c
index 4cafd3ea..ffbef48b 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -5,12 +5,14 @@
  */
 #include "cache.h"
 #include "diff.h"
+#include "commit.h"
+#include "revision.h"
 
 static const char diff_files_usage[] =
 "git-diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
 
-static struct diff_options diff_options;
+static struct rev_info rev;
 static int silent = 0;
 static int diff_unmerged_stage = 2;
 static int combine_merges = 0;
@@ -18,12 +20,12 @@ static int dense_combined_merges = 0;
 
 static void show_unmerge(const char *path)
 {
-	diff_unmerge(&diff_options, path);
+	diff_unmerge(&rev.diffopt, path);
 }
 
 static void show_file(int pfx, struct cache_entry *ce)
 {
-	diff_addremove(&diff_options, pfx, ntohl(ce->ce_mode),
+	diff_addremove(&rev.diffopt, pfx, ntohl(ce->ce_mode),
 		       ce->sha1, ce->name, NULL);
 }
 
@@ -31,7 +33,7 @@ static void show_modified(int oldmode, int mode,
 			  const unsigned char *old_sha1, const unsigned char *sha1,
 			  char *path)
 {
-	diff_change(&diff_options, oldmode, mode, old_sha1, sha1, path, NULL);
+	diff_change(&rev.diffopt, oldmode, mode, old_sha1, sha1, path, NULL);
 }
 
 int main(int argc, const char **argv)
@@ -41,7 +43,7 @@ int main(int argc, const char **argv)
 	int entries, i;
 
 	git_config(git_diff_config);
-	diff_setup(&diff_options);
+	diff_setup(&rev.diffopt);
 	while (1 < argc && argv[1][0] == '-') {
 		if (!strcmp(argv[1], "--")) {
 			argv++;
@@ -74,7 +76,7 @@ int main(int argc, const char **argv)
 			dense_combined_merges = combine_merges = 1;
 		else {
 			int diff_opt_cnt;
-			diff_opt_cnt = diff_opt_parse(&diff_options,
+			diff_opt_cnt = diff_opt_parse(&rev.diffopt,
 						      argv+1, argc-1);
 			if (diff_opt_cnt < 0)
 				usage(diff_files_usage);
@@ -88,15 +90,14 @@ int main(int argc, const char **argv)
 		}
 		argv++; argc--;
 	}
-	if (combine_merges) {
-		diff_options.output_format = DIFF_FORMAT_PATCH;
-	}
+	if (dense_combined_merges)
+		rev.diffopt.output_format = DIFF_FORMAT_PATCH;
 
 	/* Find the directory, and set up the pathspec */
 	pathspec = get_pathspec(prefix, argv + 1);
 	entries = read_cache();
 
-	if (diff_setup_done(&diff_options) < 0)
+	if (diff_setup_done(&rev.diffopt) < 0)
 		usage(diff_files_usage);
 
 	/* At this point, if argc == 1, then we are doing everything.
@@ -119,7 +120,7 @@ int main(int argc, const char **argv)
 		if (ce_stage(ce)) {
 			struct {
 				struct combine_diff_path p;
-				unsigned char fill[4][20];
+				struct combine_diff_parent filler[5];
 			} combine;
 			int num_compare_stages = 0;
 
@@ -128,7 +129,10 @@ int main(int argc, const char **argv)
 			combine.p.path = xmalloc(combine.p.len + 1);
 			memcpy(combine.p.path, ce->name, combine.p.len);
 			combine.p.path[combine.p.len] = 0;
-			memset(combine.p.sha1, 0, 100);
+			combine.p.mode = 0;
+			memset(combine.p.sha1, 0, 20);
+			memset(&combine.p.parent[0], 0,
+			       sizeof(combine.filler));
 
 			while (i < entries) {
 				struct cache_entry *nce = active_cache[i];
@@ -142,9 +146,14 @@ int main(int argc, const char **argv)
 				 */
 				stage = ce_stage(nce);
 				if (2 <= stage) {
+					int mode = ntohl(nce->ce_mode);
 					num_compare_stages++;
-					memcpy(combine.p.parent_sha1[stage-2],
+					memcpy(combine.p.parent[stage-2].sha1,
 					       nce->sha1, 20);
+					combine.p.parent[stage-2].mode =
+						canon_mode(mode);
+					combine.p.parent[stage-2].status =
+						DIFF_STATUS_MODIFIED;
 				}
 
 				/* diff against the proper unmerged stage */
@@ -160,7 +169,7 @@ int main(int argc, const char **argv)
 			if (combine_merges && num_compare_stages == 2) {
 				show_combined_diff(&combine.p, 2,
 						   dense_combined_merges,
-						   NULL, 0);
+						   &rev);
 				free(combine.p.path);
 				continue;
 			}
@@ -185,12 +194,12 @@ int main(int argc, const char **argv)
 			show_file('-', ce);
 			continue;
 		}
-		changed = ce_match_stat(ce, &st);
-		if (!changed && !diff_options.find_copies_harder)
+		changed = ce_match_stat(ce, &st, 0);
+		if (!changed && !rev.diffopt.find_copies_harder)
 			continue;
 		oldmode = ntohl(ce->ce_mode);
 
-		newmode = DIFF_FILE_CANON_MODE(st.st_mode);
+		newmode = canon_mode(st.st_mode);
 		if (!trust_executable_bit &&
 		    S_ISREG(newmode) && S_ISREG(oldmode) &&
 		    ((newmode ^ oldmode) == 0111))
@@ -199,7 +208,7 @@ int main(int argc, const char **argv)
 			      ce->sha1, (changed ? null_sha1 : ce->sha1),
 			      ce->name);
 	}
-	diffcore_std(&diff_options);
-	diff_flush(&diff_options);
+	diffcore_std(&rev.diffopt);
+	diff_flush(&rev.diffopt);
 	return 0;
 }