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

[git.git] / diff-tree.c

diff --git a/diff-tree.c b/diff-tree.c
index 6593a69..e7410b4 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -6,10 +6,10 @@ 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;
+static int always_show_header = 0;
 
 static const char *header = NULL;
 static const char *header_prefix = "";
@@ -93,6 +93,10 @@ static const char *generate_header(const unsigned char *commit_sha1,
        offset += pretty_print_commit(commit_format, commit, len,
                                      this_header + offset,
                                      sizeof(this_header) - offset, abbrev);
+       if (always_show_header) {
+               puts(this_header);
+               return NULL;
+       }
        return this_header;
 }
 
@@ -122,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);
                }
        }
@@ -262,6 +265,10 @@ int main(int argc, const char **argv)
                        no_commit_id = 1;
                        continue;
                }
+               if (!strcmp(arg, "--always")) {
+                       always_show_header = 1;
+                       continue;
+               }
                usage(diff_tree_usage);
        }
        if (diff_options.output_format == DIFF_FORMAT_PATCH)
@@ -269,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;
        }