From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Sat, 26 Jul 2008 14:48:41 +0000 (+0400)
Subject: gitk: Fixed broken exception handling in diff
X-Git-Tag: v1.6.0-rc2~4^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7272131b3e49879d3a7bedacad3cdb12ae678ee8;p=git.git

gitk: Fixed broken exception handling in diff

If the tree diff command failed to start for some
random reason, treepending remained set, and thus
no more diffs were shown after that.

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index d7fea265f..abb6542c5 100755
--- a/gitk
+++ b/gitk
@@ -6457,9 +6457,10 @@ proc diffcmd {ids flags} {
 proc gettreediffs {ids} {
     global treediff treepending
 
+    if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return
+
     set treepending $ids
     set treediff {}
-    if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return
     fconfigure $gdtf -blocking 0
     filerun $gdtf [list gettreediffline $gdtf $ids]
 }