summaryrefslogtreecommitdiff
path: root/diff-tree.c
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2005-11-10 05:30:12 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-11 09:13:05 (GMT)
commit601c978c1bc9f6742c18932cb9d4a6910934f785 (patch)
treeb51b751d57e55f71faa44e10bd3aef8fb51334cf /diff-tree.c
parent17cf939724a244a56e687559fae062a3e6207145 (diff)
downloadgit-601c978c1bc9f6742c18932cb9d4a6910934f785.zip
git-601c978c1bc9f6742c18932cb9d4a6910934f785.tar.gz
git-601c978c1bc9f6742c18932cb9d4a6910934f785.tar.bz2
Add --no-commit-id option for git-diff-tree, use it in gitk
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>
Diffstat (limited to 'diff-tree.c')
-rw-r--r--diff-tree.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/diff-tree.c b/diff-tree.c
index ed323d8..09d16ad 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -3,6 +3,7 @@
#include "commit.h"
static int show_root_diff = 0;
+static int no_commit_id = 0;
static int verbose_header = 0;
static int ignore_merges = 1;
static int read_stdin = 0;
@@ -29,7 +30,8 @@ static int call_diff_flush(void)
return 0;
}
if (header) {
- printf("%s%c", header, diff_options.line_termination);
+ if (!no_commit_id)
+ printf("%s%c", header, diff_options.line_termination);
header = NULL;
}
diff_flush(&diff_options);
@@ -231,6 +233,10 @@ int main(int argc, const char **argv)
show_root_diff = 1;
continue;
}
+ if (!strcmp(arg, "--no-commit-id")) {
+ no_commit_id = 1;
+ continue;
+ }
usage(diff_tree_usage);
}
if (diff_options.output_format == DIFF_FORMAT_PATCH)