From e3c3a550d4815d34b5674776c36cdd6d8a31ab85 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 5 Feb 2006 22:25:00 -0800 Subject: combine-diff: remove misguided --show-empty hack. 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 --- diff-tree.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'diff-tree.c') diff --git a/diff-tree.c b/diff-tree.c index 2df23c65f..e7410b4e0 100644 --- 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; } -- cgit v1.2.1