Skip to content

Commit 5eb9397

Browse files
committed
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 <[email protected]>
1 parent 63a5845 commit 5eb9397

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

git-gui.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2205,11 +2205,13 @@ proc do_gitk {revs {is_submodule false}} {
22052205
set env(GIT_WORK_TREE) $_gitworktree
22062206
cd $pwd
22072207
2208-
set status_operation [$::main_status \
2209-
start \
2210-
[mc "Starting %s... please wait..." "gitk"]]
2208+
if {[info exists main_status]} {
2209+
set status_operation [$::main_status \
2210+
start \
2211+
[mc "Starting %s... please wait..." "gitk"]]
22112212
2212-
after 3500 [list $status_operation stop]
2213+
after 3500 [list $status_operation stop]
2214+
}
22132215
}
22142216
}
22152217

0 commit comments

Comments
 (0)