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 --- combine-diff.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'combine-diff.c') diff --git a/combine-diff.c b/combine-diff.c index 210ffcbce..250de1c62 100644 --- 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; } } -- cgit v1.2.1