X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-files.c;h=3e7f5f105b19fd47fd8b3716617592ec2a60da47;hb=22c31bf183bff576c7807f9d67abfc11ee8e1fa4;hp=4ba59f1a25e01ef25392b3a77daa9a7a6d59287f;hpb=e3c3a550d4815d34b5674776c36cdd6d8a31ab85;p=git.git

diff --git a/diff-files.c b/diff-files.c
index 4ba59f1a..3e7f5f10 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -88,9 +88,8 @@ int main(int argc, const char **argv)
 		}
 		argv++; argc--;
 	}
-	if (combine_merges) {
+	if (dense_combined_merges)
 		diff_options.output_format = DIFF_FORMAT_PATCH;
-	}
 
 	/* Find the directory, and set up the pathspec */
 	pathspec = get_pathspec(prefix, argv + 1);
@@ -119,7 +118,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 +127,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 +144,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 +167,8 @@ int main(int argc, const char **argv)
 			if (combine_merges && num_compare_stages == 2) {
 				show_combined_diff(&combine.p, 2,
 						   dense_combined_merges,
-						   NULL);
+						   NULL,
+						   &diff_options);
 				free(combine.p.path);
 				continue;
 			}
@@ -185,12 +193,12 @@ int main(int argc, const char **argv)
 			show_file('-', ce);
 			continue;
 		}
-		changed = ce_match_stat(ce, &st);
+		changed = ce_match_stat(ce, &st, 0);
 		if (!changed && !diff_options.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))