combine-diff: remove misguided --show-empty hack.

Junio C Hamano · Junio C Hamano · commit e3c3a550d481 · 2006-02-05T22:25:00.000-08:00
Now --always flag is available in diff-tree, there is no reason
to have that hack in the diffcore side.

Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/combine-diff.c b/combine-diff.c
@@ -608,7 +608,7 @@ static void reuse_combine_diff(struct sline *sline, unsigned long cnt,
 }
 
 int show_combined_diff(struct combine_diff_path *elem, int num_parent,
-		       int dense, const char *header, int show_empty)
+		       int dense, const char *header)
 {
 	unsigned long size, cnt, lno;
 	char *result, *cp, *ep;
@@ -742,8 +742,7 @@ int show_combined_diff(struct combine_diff_path *elem, int num_parent,
 }
 
 int diff_tree_combined_merge(const unsigned char *sha1,
-			     const char *header,
-			     int show_empty_merge, int dense)
+			     const char *header, int dense)
 {
 	struct commit *commit = lookup_commit(sha1);
 	struct diff_options diffopts;
@@ -777,12 +776,11 @@ int diff_tree_combined_merge(const unsigned char *sha1,
 		if (p->len)
 			num_paths++;
 	}
-	if (num_paths || show_empty_merge) {
+	if (num_paths) {
 		for (p = paths; p; p = p->next) {
 			if (!p->len)
 				continue;
-			if (show_combined_diff(p, num_parent, dense, header,
-					       show_empty_merge))
+			if (show_combined_diff(p, num_parent, dense, header))
 				header = NULL;
 		}
 	}
diff --git a/diff-files.c b/diff-files.c
@@ -160,7 +160,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);
+						   NULL);
 				free(combine.p.path);
 				continue;
 			}
diff --git a/diff-tree.c b/diff-tree.c
@@ -6,7 +6,6 @@ static int show_root_diff = 0;
 static int no_commit_id = 0;
 static int verbose_header = 0;
 static int ignore_merges = 1;
-static int show_empty_combined = 0;
 static int combine_merges = 0;
 static int dense_combined_merges = 0;
 static int read_stdin = 0;
@@ -127,7 +126,6 @@ static int diff_tree_commit(const unsigned char *commit_sha1)
 		else if (combine_merges) {
 			header = generate_header(sha1, sha1, commit);
 			return diff_tree_combined_merge(sha1, header,
-							show_empty_combined,
 							dense_combined_merges);
 		}
 	}
@@ -278,7 +276,6 @@ int main(int argc, const char **argv)
 
 	if (combine_merges) {
 		diff_options.output_format = DIFF_FORMAT_PATCH;
-		show_empty_combined = !ignore_merges;
 		ignore_merges = 0;
 	}
 
diff --git a/diff.h b/diff.h
@@ -68,9 +68,9 @@ struct combine_diff_path {
 };
 
 int show_combined_diff(struct combine_diff_path *elem, int num_parent,
-		       int dense, const char *header, int show_empty);
+		       int dense, const char *header);
 
-extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int);
+extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int);
 
 extern void diff_addremove(struct diff_options *,
 			   int addremove,

Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,7 @@ static void reuse_combine_diff(struct sline *sline, unsigned long cnt,`
`608`	`608`	`}`
`609`	`609`
`610`	`610`	`int show_combined_diff(struct combine_diff_path *elem, int num_parent,`
`611`		`- int dense, const char *header, int show_empty)`
	`611`	`+ int dense, const char *header)`
`612`	`612`	`{`
`613`	`613`	`unsigned long size, cnt, lno;`
`614`	`614`	`char result, cp, *ep;`
`@@ -742,8 +742,7 @@ int show_combined_diff(struct combine_diff_path *elem, int num_parent,`
`742`	`742`	`}`
`743`	`743`
`744`	`744`	`int diff_tree_combined_merge(const unsigned char *sha1,`
`745`		`- const char *header,`
`746`		`- int show_empty_merge, int dense)`
	`745`	`+ const char *header, int dense)`
`747`	`746`	`{`
`748`	`747`	`struct commit *commit = lookup_commit(sha1);`
`749`	`748`	`struct diff_options diffopts;`
`@@ -777,12 +776,11 @@ int diff_tree_combined_merge(const unsigned char *sha1,`
`777`	`776`	`if (p->len)`
`778`	`777`	`num_paths++;`
`779`	`778`	`}`
`780`		`- if (num_paths \|\| show_empty_merge) {`
	`779`	`+ if (num_paths) {`
`781`	`780`	`for (p = paths; p; p = p->next) {`
`782`	`781`	`if (!p->len)`
`783`	`782`	`continue;`
`784`		`- if (show_combined_diff(p, num_parent, dense, header,`
`785`		`- show_empty_merge))`
	`783`	`+ if (show_combined_diff(p, num_parent, dense, header))`
`786`	`784`	`header = NULL;`
`787`	`785`	`}`
`788`	`786`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ int main(int argc, const char **argv)`
`160`	`160`	`if (combine_merges && num_compare_stages == 2) {`
`161`	`161`	`show_combined_diff(&combine.p, 2,`
`162`	`162`	`dense_combined_merges,`
`163`		`- NULL, 0);`
	`163`	`+ NULL);`
`164`	`164`	`free(combine.p.path);`
`165`	`165`	`continue;`
`166`	`166`	`}`