cvsimport: Add -S <skipfileregex> support and -v announces files retrieved

[git.git] / diff-tree.c

diff --git a/diff-tree.c b/diff-tree.c
index 0c68936..6593a69 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -8,6 +8,7 @@ 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 const char *header = NULL;
@@ -66,12 +67,13 @@ static int diff_root_tree(const unsigned char *new, const char *base)
 
 static const char *generate_header(const unsigned char *commit_sha1,
                                   const unsigned char *parent_sha1,
-                                  const char *msg)
+                                  const struct commit *commit)
 {
        static char this_header[16384];
        int offset;
        unsigned long len;
        int abbrev = diff_options.abbrev;
+       const char *msg = commit->buffer;
 
        if (!verbose_header)
                return sha1_to_hex(commit_sha1);
@@ -88,9 +90,9 @@ static const char *generate_header(const unsigned char *commit_sha1,
                                  : "root");
        else
                offset += sprintf(this_header + offset, "(from parents)\n");
-       offset += pretty_print_commit(commit_format, msg, len,
+       offset += pretty_print_commit(commit_format, commit, len,
                                      this_header + offset,
-                                     sizeof(this_header) - offset);
+                                     sizeof(this_header) - offset, abbrev);
        return this_header;
 }
 
@@ -109,7 +111,7 @@ static int diff_tree_commit(const unsigned char *commit_sha1)
        
        /* Root commit? */
        if (show_root_diff && !commit->parents) {
-               header = generate_header(sha1, NULL, commit->buffer);
+               header = generate_header(sha1, NULL, commit);
                diff_root_tree(commit_sha1, "");
        }
 
@@ -118,18 +120,16 @@ static int diff_tree_commit(const unsigned char *commit_sha1)
                if (ignore_merges)
                        return 0;
                else if (combine_merges) {
-                       header = generate_header(sha1, sha1,
-                                                commit->buffer);
+                       header = generate_header(sha1, sha1, commit);
                        return diff_tree_combined_merge(sha1, header,
-                                                       show_empty_combined);
+                                                       show_empty_combined,
+                                                       dense_combined_merges);
                }
        }
 
        for (parents = commit->parents; parents; parents = parents->next) {
                struct commit *parent = parents->item;
-               header = generate_header(sha1,
-                                        parent->object.sha1,
-                                        commit->buffer);
+               header = generate_header(sha1, parent->object.sha1, commit);
                diff_tree_sha1_top(parent->object.sha1, commit_sha1, "");
                if (!header && verbose_header) {
                        header_prefix = "\ndiff-tree ";
@@ -168,7 +168,7 @@ static int diff_tree_stdin(char *line)
 }
 
 static const char diff_tree_usage[] =
-"git-diff-tree [--stdin] [-m] [-c] [-s] [-v] [--pretty] [-t] [-r] [--root] "
+"git-diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] "
 "[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
 "  -r            diff recursively\n"
 "  --root        include the initial commit as diff against /dev/null\n"
@@ -235,6 +235,10 @@ int main(int argc, const char **argv)
                        combine_merges = 1;
                        continue;
                }
+               if (!strcmp(arg, "--cc")) {
+                       dense_combined_merges = combine_merges = 1;
+                       continue;
+               }
                if (!strcmp(arg, "-v")) {
                        verbose_header = 1;
                        header_prefix = "diff-tree ";