mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-20 04:13:54 +01:00
Code

[PATCH] Support commit_format in diff-tree

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-06-12 17:44:21 -07:00 committed by Linus Torvalds
parent dc7090efbc
commit a8db165ee9
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
diff-tree.c
View File

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