aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-27 00:14:46 -0700
committerJunio C Hamano <junkio@cox.net>2005-10-27 00:14:46 -0700
commit1301c6eb412e7c5511b952a12e42c70ad56f028b (patch)
tree6715007aff63762542d84d93d8ec200ea94084c2
parentbd321bcc51e95f644ac5335abe673afcbcaade62 (diff)
parent8b7e5d76e836396a097bb6f61cf930ea872a7bd3 (diff)
downloadgit-1301c6eb412e7c5511b952a12e42c70ad56f028b.tar.gz
git-1301c6eb412e7c5511b952a12e42c70ad56f028b.tar.xz
Merge http://www.kernel.org/pub/scm/gitk/gitk
-rwxr-xr-xgitk4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitk b/gitk
index f1ea4e1e4..a9d37d9c7 100755
--- a/gitk
+++ b/gitk
@@ -2806,7 +2806,7 @@ proc gettreediffs {ids} {
set treediff {}
set id [lindex $ids 0]
set p [lindex $ids 1]
- if [catch {set gdtf [open "|git-diff-tree -r $p $id" r]}] return
+ if [catch {set gdtf [open "|git-diff-tree -r $id" r]}] return
fconfigure $gdtf -blocking 0
fileevent $gdtf readable [list gettreediffline $gdtf $ids]
}
@@ -2842,7 +2842,7 @@ proc getblobdiffs {ids} {
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 $p $id]
+ set cmd [list | git-diff-tree -r -p -C $id]
if {[catch {set bdf [open $cmd r]} err]} {
puts "error getting diffs: $err"
return