summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2005-11-11 15:09:12 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-19 08:00:37 (GMT)
commitfd913b39101c6ff185e76e459479621c9b475fa1 (patch)
tree07a6e051435ee87700e23f7674c09bf6c4ad3bc0
parente246483dc5b56d7deb04a93b0aa08aba4cde0625 (diff)
downloadgit-fd913b39101c6ff185e76e459479621c9b475fa1.zip
git-fd913b39101c6ff185e76e459479621c9b475fa1.tar.gz
git-fd913b39101c6ff185e76e459479621c9b475fa1.tar.bz2
gitk: use git-diff-tree --no-commit-id
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>
-rwxr-xr-xgitk6
1 files changed, 2 insertions, 4 deletions
diff --git a/gitk b/gitk
index 5deab53..29220b1 100755
--- a/gitk
+++ b/gitk
@@ -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]
}
@@ -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