From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 8 Nov 2006 02:30:46 +0000 (-0500)
Subject: git-gui: Grab the index lock while running pull.
X-Git-Tag: gitgui-0.6.0~276
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=988b8a7d63ff52f252bb4c517d9f05c3952aa728;p=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>
---

diff --git a/git-gui b/git-gui
index 8562983d3..2d82152b3 100755
--- a/git-gui
+++ b/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 {