X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=combine-diff.c;h=9445e86c2f329858d5b805d144d6668526e0c289;hb=245f1029d674b95d63b5faea2269f98d28b3adb2;hp=c45d7736592f483c5c454c9571bb62c1e7835707;hpb=740659519e0b30bc6b64f00ba69825294c40db07;p=git.git

diff --git a/combine-diff.c b/combine-diff.c
index c45d7736..9445e86c 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -506,8 +506,8 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent)
 
 	while (1) {
 		struct sline *sl = &sline[lno];
-		int hunk_end;
-		int rlines;
+		unsigned long hunk_end;
+		unsigned long rlines;
 		while (lno <= cnt && !(sline[lno].flag & mark))
 			lno++;
 		if (cnt < lno)
@@ -589,7 +589,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
 			   struct diff_options *opt)
 {
 	unsigned long result_size, cnt, lno;
-	char *result, *cp, *ep;
+	char *result, *cp;
 	struct sline *sline; /* survived lines */
 	int mode_differs = 0;
 	int i, show_hunks, shown_header = 0;
@@ -641,7 +641,6 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
 		cnt++; /* incomplete line */
 
 	sline = xcalloc(cnt+2, sizeof(*sline));
-	ep = result;
 	sline[0].bol = result;
 	for (lno = 0; lno <= cnt + 1; lno++) {
 		sline[lno].lost_tail = &sline[lno].lost_head;
@@ -752,7 +751,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
 
 static void show_raw_diff(struct combine_diff_path *p, int num_parent, const char *header, struct diff_options *opt)
 {
-	int i, offset, mod_type = 'A';
+	int i, offset;
 	const char *prefix;
 	int line_termination, inter_name_termination;
 
@@ -764,13 +763,6 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, const cha
 	if (header)
 		printf("%s%c", header, line_termination);
 
-	for (i = 0; i < num_parent; i++) {
-		if (p->parent[i].mode)
-			mod_type = 'M';
-	}
-	if (!p->mode)
-		mod_type = 'D';
-
 	if (opt->output_format == DIFF_FORMAT_RAW) {
 		offset = strlen(COLONS) - num_parent;
 		if (offset < 0)
@@ -843,6 +835,7 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
 
 	diffopts = *opt;
 	diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
+	diffopts.with_raw = 0;
 	diffopts.recursive = 1;
 
 	/* count parents */
@@ -869,6 +862,17 @@ const char *diff_tree_combined_merge(const unsigned char *sha1,
 			num_paths++;
 	}
 	if (num_paths) {
+		if (opt->with_raw) {
+			int saved_format = opt->output_format;
+			opt->output_format = DIFF_FORMAT_RAW;
+			for (p = paths; p; p = p->next) {
+				if (show_combined_diff(p, num_parent, dense,
+						       header, opt))
+					header = NULL;
+			}
+			opt->output_format = saved_format;
+			putchar(opt->line_termination);
+		}
 		for (p = paths; p; p = p->next) {
 			if (show_combined_diff(p, num_parent, dense,
 					       header, opt))