зеркало из https://github.com/microsoft/git.git
git-gui: Disable pull menu items when the index is locked.
If we have the index locked then no pull command is allowed to proceed (as it would fail to get the index lock itself). So disable the pull menu items when we are doing any index based operations. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Родитель
2bc5b3487e
Коммит
0a462d6776
4
git-gui
4
git-gui
|
@ -932,7 +932,7 @@ proc populate_remote_menu {m pfx op} {
|
|||
}
|
||||
|
||||
proc populate_pull_menu {m} {
|
||||
global gitdir repo_config all_remotes mainfont
|
||||
global gitdir repo_config all_remotes mainfont disable_on_lock
|
||||
|
||||
foreach remote $all_remotes {
|
||||
set rb {}
|
||||
|
@ -961,6 +961,8 @@ proc populate_pull_menu {m} {
|
|||
-label "Branch $rb_short from $remote..." \
|
||||
-command [list pull_remote $remote $rb] \
|
||||
-font $mainfont
|
||||
lappend disable_on_lock \
|
||||
[list $m entryconf [$m index last] -state]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче