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

PATCH New Pavel Roskin 1 participant 1 message Jun 15, 2016 Documentation

lore

Share & tools

lore

Pavel Roskin

author

2016-06-15 22:42 UTC #0 lore raw

PATCH 1/1 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.

This option is used in gitk, to suppress empty lines after "Comments" introduced in 8b7e5d76e836396a097bb6f61cf930ea872a7bd3. Also, the p variable is removed where is became unused due to the same patch.

Signed-off-by Pavel Roskin <[email protected]>

Documentation/git-diff-tree.txt +5 -1

index f57c8d0..9a2947e 100644
@@ -8,7 +8,7 @@ git-diff-tree - Compares the content and
 
 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
 -----------

@@ -74,6 +74,10 @@ separated with a single space are given.
 	commit message.  Without "=<style>", it defaults to
 	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
 ---------------

diff-tree.c +6 -1

index ed323d8..f2c629b 100644
@@ -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;

@@ -28,7 +29,7 @@ static int call_diff_flush(void)
 		diff_options.output_format = saved_fmt;
 		return 0;
 	}
-	if (header) {
+	if (header && !no_commit_id) {
 		printf("%s%c", header, diff_options.line_termination);
 		header = NULL;
 	}

@@ -231,6 +232,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)

gitk +2 -4

index a9d37d9..6d47139 100755
@@ -2805,8 +2805,7 @@ proc gettreediffs {ids} {
     set treepending $ids
     set treediff {}
     set id [lindex $ids 0]
-    set p [lindex $ids 1]
-    if [catch {set gdtf [open "|git-diff-tree -r $id" r]}] return
+    if [catch {set gdtf [open "|git-diff-tree --no-commit-id -r $id" r]}] return
     fconfigure $gdtf -blocking 0
     fileevent $gdtf readable [list gettreediffline $gdtf $ids]
 }

@@ -2840,9 +2839,8 @@ proc getblobdiffs {ids} {
     global difffilestart nextupdate diffinhdr treediffs
 
     set id [lindex $ids 0]
-    set p [lindex $ids 1]
     set env(GIT_DIFF_OPTS) $diffopts
-    set cmd [list | git-diff-tree -r -p -C $id]
+    set cmd [list | git-diff-tree --no-commit-id -r -p -C $id]
     if {[catch {set bdf [open $cmd r]} err]} {
 	puts "error getting diffs: $err"
 	return

Signature · 2 lines

Regards,
Pavel Roskin