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 <junkio@cox.net>

diff --git a/combine-diff.c b/combine-diff.c
index 210ffcbce38bf1155c6e9b054e0950ee07c979fe..250de1c629e14bde19c2f011982d64d8ea16288d 100644 (file)
--- 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
index 4cafd3ea20080c408ffba1584202e8feb6d53764..4ba59f1a25e01ef25392b3a77daa9a7a6d59287f 100644 (file)
--- 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
index 2df23c65fdf84b511069c516810debec74fe7d2b..e7410b4e0b461b43afaa43f02d7869d39a978768 100644 (file)
--- 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
index 32134d79b5942b21ef55549801f91b31d980e948..ff41c5859db297e13864d842d3773da93f1abfcf 100644 (file)
--- 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,