aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gavrilov <angavrilov@gmail.com>2008-07-26 18:48:41 +0400
committerPaul Mackerras <paulus@samba.org>2008-07-31 20:29:44 +1000
commit7272131b3e49879d3a7bedacad3cdb12ae678ee8 (patch)
treea51c3c595456753700e1199324ef516ce93c6fe5
parentb6326e92ef39b37361002bffb1f94645339eec59 (diff)
downloadgit-7272131b3e49879d3a7bedacad3cdb12ae678ee8.tar.gz
git-7272131b3e49879d3a7bedacad3cdb12ae678ee8.tar.xz
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>
-rwxr-xr-xgitk3
1 files changed, 2 insertions, 1 deletions
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]
}