[PATCH] Fix rename/copy when dealing with temporarily broken pairs.

diff --git a/diff-tree.c b/diff-tree.c
index 3881c23ca37a86c41ec12b2d5c4713ab01cc9d82..6c98e62ad00962858e235f2a4299a530c2afdaf6 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -19,6 +19,7 @@ static int diff_break_opt = -1;
 static const char *orderfile = NULL;
 static const char *header = NULL;
 static const char *header_prefix = "";
+static enum cmit_fmt commit_format = CMIT_FMT_RAW;
 
 // What paths are we interested in?
 static int nr_paths = 0;
@@ -321,7 +322,7 @@ static char *generate_header(const char *commit, const char *parent, const char
 
        offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
        if (verbose_header) {
-               offset += pretty_print_commit(msg, len, this_header + offset, sizeof(this_header) - offset);
+               offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset);
                this_header[offset++] = '\n';
                this_header[offset++] = 0;
        }
@@ -397,7 +398,20 @@ static int diff_tree_stdin(char *line)
 }
 
 static char *diff_tree_usage =
-"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [-m] [-s] [-v] [-t] <tree-ish> <tree-ish>";
+"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [-m] [-s] [-v] [--pretty] [-t] <tree-ish> <tree-ish>";
+
+static enum cmit_fmt get_commit_format(const char *arg)
+{
+       if (!*arg)
+               return CMIT_FMT_DEFAULT;
+       if (!strcmp(arg, "=raw"))
+               return CMIT_FMT_RAW;
+       if (!strcmp(arg, "=medium"))
+               return CMIT_FMT_MEDIUM;
+       if (!strcmp(arg, "=short"))
+               return CMIT_FMT_SHORT;
+       usage(diff_tree_usage);
+}
 
 int main(int argc, const char **argv)
 {
@@ -491,6 +505,12 @@ int main(int argc, const char **argv)
                        header_prefix = "diff-tree ";
                        continue;
                }
+               if (!strncmp(arg, "--pretty", 8)) {
+                       verbose_header = 1;
+                       header_prefix = "diff-tree ";
+                       commit_format = get_commit_format(arg+8);
+                       continue;
+               }
                if (!strcmp(arg, "--stdin")) {
                        read_stdin = 1;
                        continue;