undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add --no-commit-id option for git-diff-tree, use it in gitk

Browse Source 
This patch introduces -no-commit-id option for git-diff-tree, which
suppresses commit ID output.

[jc: dropped gitk part for now.]

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Pavel Roskin 2005-11-10 00:30:12 -05:00 committed by Junio C Hamano
parent 17cf939724
commit 601c978c1b
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-diff-tree.txt
View File

@ -8,7 +8,7 @@ git-diff-tree - Compares the content and mode of blobs found via two tree object
SYNOPSIS SYNOPSIS
-------- --------
'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-r] [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...] 'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r] [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
DESCRIPTION DESCRIPTION
----------- -----------
@ -74,6 +74,10 @@ separated with a single space are given.
commit message. Without "=<style>", it defaults to commit message. Without "=<style>", it defaults to
medium. medium.
--no-commit-id::
git-diff-tree outputs a line with the commit ID when
applicable. This flag suppressed the commit ID output.
Limiting Output Limiting Output
--------------- ---------------

8
diff-tree.c
View File

@ -3,6 +3,7 @@
#include "commit.h" #include "commit.h"
static int show_root_diff = 0; static int show_root_diff = 0;
static int no_commit_id = 0;
static int verbose_header = 0; static int verbose_header = 0;
static int ignore_merges = 1; static int ignore_merges = 1;
static int read_stdin = 0; static int read_stdin = 0;
@ -29,7 +30,8 @@ static int call_diff_flush(void)
return 0; return 0;
} }
if (header) { if (header) {
printf("%s%c", header, diff_options.line_termination); if (!no_commit_id)
printf("%s%c", header, diff_options.line_termination);
header = NULL; header = NULL;
} }
diff_flush(&diff_options); diff_flush(&diff_options);
@ -231,6 +233,10 @@ int main(int argc, const char **argv)
show_root_diff = 1; show_root_diff = 1;
continue; continue;
} }
if (!strcmp(arg, "--no-commit-id")) {
no_commit_id = 1;
continue;
}
usage(diff_tree_usage); usage(diff_tree_usage);
} }
if (diff_options.output_format == DIFF_FORMAT_PATCH) if (diff_options.output_format == DIFF_FORMAT_PATCH)