Thread (10 messages) flat view 10 messages, 2 authors, 2016-06-15
STALE3730d

[PATCH (GITK) 4/6] gitk: Fixed broken exception handling in diff.

From: Alexander Gavrilov <hidden>
Date: 2016-06-15 22:45:03
Subsystem: the rest · Maintainer: Linus Torvalds

Date: Sat, 26 Jul 2008 18:48:41 +0400

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 <redacted>
---
 gitk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gitk b/gitk
index d7fea26..abb6542 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]
 }
-- 
1.5.6.3.18.gfe82
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help