зеркало из https://github.com/microsoft/git.git
git-gui: Grab the index lock while running pull.
The user must not modify the index while a git pull operation is running, doing so might cause problems for the merge driver and specific strategy being used. Normally on the command line people are just really good and don't try to run index altering operations while they are also running a pull. But in a slick GUI like git-gui we can't trust the user quite as much. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Родитель
e534f3a886
Коммит
988b8a7d63
2
git-gui
2
git-gui
|
@ -642,6 +642,7 @@ proc fetch_from {remote} {
|
|||
}
|
||||
|
||||
proc pull_remote {remote branch} {
|
||||
if {![lock_index update]} return
|
||||
set w [new_console "pull $remote $branch" \
|
||||
"Pulling new changes from branch $branch in $remote"]
|
||||
set cmd [list git pull]
|
||||
|
@ -651,6 +652,7 @@ proc pull_remote {remote branch} {
|
|||
}
|
||||
|
||||
proc post_pull_remote {remote branch success} {
|
||||
unlock_index
|
||||
if {$success} {
|
||||
update_status "Successfully pulled $branch from $remote."
|
||||
} else {
|
||||
|
|
Загрузка…
Ссылка в новой задаче