summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPratyush Yadav <me@yadavpratyush.com>2020-03-14 17:11:45 (GMT)
committerPratyush Yadav <me@yadavpratyush.com>2020-03-14 17:11:45 (GMT)
commitd769dcc5cdd92e046eadee3cf878afc7ca806b14 (patch)
treee5d885e9e2deb013d9efafc3e9429af1e6426448
parent63a58457e094c9c9bbf562b872009d32f1f88133 (diff)
parent5eb9397e88dfc04b9993484fe8835f7eebdf1100 (diff)
downloadgit-d769dcc5cdd92e046eadee3cf878afc7ca806b14.zip
git-d769dcc5cdd92e046eadee3cf878afc7ca806b14.tar.gz
git-d769dcc5cdd92e046eadee3cf878afc7ca806b14.tar.bz2
Merge branch 'py/blame-status-error'
Fixes an error popup in blame because of a missing closing bracket. * py/blame-status-error: git-gui: fix error popup when doing blame -> "Show History Context"
-rwxr-xr-xgit-gui.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/git-gui.sh b/git-gui.sh
index f41ed2e..d939844 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -2205,11 +2205,13 @@ proc do_gitk {revs {is_submodule false}} {
set env(GIT_WORK_TREE) $_gitworktree
cd $pwd
- set status_operation [$::main_status \
- start \
- [mc "Starting %s... please wait..." "gitk"]]
+ if {[info exists main_status]} {
+ set status_operation [$::main_status \
+ start \
+ [mc "Starting %s... please wait..." "gitk"]]
- after 3500 [list $status_operation stop]
+ after 3500 [list $status_operation stop]
+ }
}
}