diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-27 00:14:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-27 00:14:46 -0700 |
| commit | 1301c6eb412e7c5511b952a12e42c70ad56f028b (patch) | |
| tree | 6715007aff63762542d84d93d8ec200ea94084c2 | |
| parent | Add git-name-rev (diff) | |
| parent | [PATCH] Make "gitk" work better with dense revlists (diff) | |
| download | git-1301c6eb412e7c5511b952a12e42c70ad56f028b.tar.gz git-1301c6eb412e7c5511b952a12e42c70ad56f028b.zip | |
Merge http://www.kernel.org/pub/scm/gitk/gitk
| -rwxr-xr-x | gitk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |