diff options
| author |  Pratyush Yadav <me@yadavpratyush.com> | 2020-03-02 23:45:54 +0530 |
|---|---|---|
| committer | Pratyush Yadav <me@yadavpratyush.com> | 2020-03-03 00:06:34 +0530 |
| commit | 5eb9397e88dfc04b9993484fe8835f7eebdf1100 (patch) | |
| tree | e5d885e9e2deb013d9efafc3e9429af1e6426448 | |
| parent | Merge branch 'py/missing-bracket' (diff) | |
| download | tgif-5eb9397e88dfc04b9993484fe8835f7eebdf1100.tar.xz | |
git-gui: fix error popup when doing blame -> "Show History Context"
In d9c6469 (git-gui: update status bar to track operations, 2019-12-01)
the call to 'ui_status' in 'do_gitk' was updated to create the newly
introduced "status bar operation". This allowed this status text to show
along with other operations happening in parallel, and removed a race
between all these operations.
But in that refactor, the fact that 'ui_status' checks for the existence
of 'main_status' was overlooked. This leads to an error message popping
up when the user selects "Show History Context" from the blame window
context menu on a source line. The error occurs because when running
"blame" 'main_status' is not initialized.
So, add a check for the existence of 'main_status' in 'do_gitk'. This
fix reverts to the original behaviour. In the future, we might want to
look into a better way of telling 'do_gitk' which status bar to use.
Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
| -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] + } } } |