[PATCH] Support commit_format in diff-tree

This steals --pretty command line option from rev-list and
teaches diff-tree to do the same.  With this change,

$ git-whatchanged --pretty

would work as expected.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/diff-tree.c b/diff-tree.c
index 6f8dc2024c289a92fe81014511a8377364340783..3c8838582fbe516ef028dc5564d0e39287f0f4ea 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -398,7 +398,20 @@ static int diff_tree_stdin(char *line)
 }
 
 static char *diff_tree_usage =
 }
 
 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)
 {
 
 int main(int argc, const char **argv)
 {


@@ -492,6 +505,11 @@ int main(int argc, const char **argv)
                        header_prefix = "diff-tree ";
                        continue;
                }
                        header_prefix = "diff-tree ";
                        continue;
                }

+               if (!strncmp(arg, "--pretty", 8)) {
+                       verbose_header = 1;
+                       commit_format = get_commit_format(arg+8);
+                       continue;
+               }

                if (!strcmp(arg, "--stdin")) {
                        read_stdin = 1;
                        continue;
                if (!strcmp(arg, "--stdin")) {
                        read_stdin = 1;
                        continue;