mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-06 09:51:24 +02:00
Code

Merge http://www.kernel.org/pub/scm/gitk/gitk

Browse Source
This commit is contained in:
Junio C Hamano 2005-10-27 00:14:46 -07:00
commit 1301c6eb41
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gitk
View File

@ -2806,7 +2806,7 @@ proc gettreediffs {ids} {
set treediff {} set treediff {}
set id [lindex $ids 0] set id [lindex $ids 0]
set p [lindex $ids 1] 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 fconfigure $gdtf -blocking 0
fileevent $gdtf readable [list gettreediffline $gdtf $ids] fileevent $gdtf readable [list gettreediffline $gdtf $ids]
} }
@ -2842,7 +2842,7 @@ proc getblobdiffs {ids} {
set id [lindex $ids 0] set id [lindex $ids 0]
set p [lindex $ids 1] set p [lindex $ids 1]
set env(GIT_DIFF_OPTS) $diffopts 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]} { if {[catch {set bdf [open $cmd r]} err]} {
puts "error getting diffs: $err" puts "error getting diffs: $err"
return return