Skip to content

Commit d769dcc

Browse files
committed
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"
2 parents 63a5845 + 5eb9397 commit d769dcc

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)