Skip to content

Commit

Permalink
gitk: use git-diff-tree --no-commit-id
Browse files Browse the repository at this point in the history
gitk switched to use git-diff-tree with one argument in gettreediffs and
getblobdiffs.  git-diff-tree with one argument outputs commit ID in from
of the patch.  This causes an empty line after "Comments" in the lower
right pane.  Also, the diff in the lower left pane has the commit ID,
which is useless there.

This patch makes git use the newly added -no-commit-id option for
git-diff-tree to suppress commit ID.  It also removes the p variable in
both functions, since it has become useless after switching to the
one-argument invocation for git-diff-tree.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Pavel Roskin authored and Junio C Hamano committed Nov 19, 2005
1 parent e246483 commit fd913b3
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions gitk
Original file line number Diff line number Diff line change
Expand Up @@ -2787,8 +2787,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]
}
Expand Down Expand Up @@ -2822,9 +2821,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
Expand Down

0 comments on commit fd913b3

Please sign in to comment.