From: Junio C Hamano <junkio@cox.net>
Date: Mon, 13 Jun 2005 00:44:21 GMT
Subject: [PATCH] Support commit_format fully in diff-tree
Message-ID: <7vslzngk62.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20050612093413.GR20432@cip.informatik.uni-erlangen.de>

>>>>> "TG" == Thomas Glanzmann <sithglan@stud.uni-erlangen.de> writes:

TG> Hello,
TG> what option to I have to tweak to get timestamps human understandable
TG> again:

TG> git-whatchanged | head -5

------------
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>
---

*** Sorry, but this patch does not include documentation updates
*** or additional tests like my usual ones.  I would appreciate
*** it if others on the list give help with them.  I will be
*** offline for about a week or so, and trying to clean my stack
*** as much as possible before I have to leave.

cd /opt/packrat/playpen/public/in-place/git/git.junio/
jit-diff : diff-tree.c
# - linus: git-apply: ignore empty git headers
# + (working tree)
diff --git a/diff-tree.c b/diff-tree.c
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -398,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)
 {
@@ -492,6 +505,11 @@ int main(int argc, const char **argv)
 			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;

Compilation finished at Sun Jun 12 17:39:24