@matheusbsbs / matheus-bagliano / commits / 5eb9397e88
Fork 0

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>

Pratyush Yadav committed Mar 2, 2020 at 23:45 UTC 5eb9397e88dfc04b9993484fe8835f7eebdf1100
1 file changed +6 -4
git-gui.sh
+6 -4
@@ -2205,11 +2205,13 @@ proc do_gitk {revs {is_submodule false}} {
2205 set env(GIT_WORK_TREE) $_gitworktree
2206 cd $pwd
2207
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"]]
2212
2212 - after 3500 [list $status_operation stop]
2213 + after 3500 [list $status_operation stop]
2214 + }
2215 }
2216 }
2217