diff options
| author | Pratyush Yadav <me@yadavpratyush.com> | 2020-03-14 22:41:45 +0530 |
|---|---|---|
| committer | Pratyush Yadav <me@yadavpratyush.com> | 2020-03-14 22:41:45 +0530 |
| commit | d769dcc5cdd92e046eadee3cf878afc7ca806b14 (patch) | |
| tree | e5d885e9e2deb013d9efafc3e9429af1e6426448 | |
| parent | 63a58457e094c9c9bbf562b872009d32f1f88133 (diff) | |
| parent | 5eb9397e88dfc04b9993484fe8835f7eebdf1100 (diff) | |
| download | git-d769dcc5cdd92e046eadee3cf878afc7ca806b14.tar.gz | |
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-x | git-gui.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/git-gui.sh b/git-gui.sh index f41ed2eb20..d939844942 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] + } } } |