From edbe3319433ebec420954350b4b63b7bfcc58c83 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 3 Mar 2016 12:55:00 -0400
Subject: lock index while making index-less commits

Avoids race with another git commit at the same time adjusted branch is
being updated.
---
 Annex/AdjustedBranch.hs | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs
index c1820417d..5a015e986 100644
--- a/Annex/AdjustedBranch.hs
+++ b/Annex/AdjustedBranch.hs
@@ -22,6 +22,8 @@ import qualified Git.Ref
 import qualified Git.Command
 import Git.Tree
 import Git.Env
+import Git.Index
+import qualified Git.LockFile
 import Annex.CatFile
 import Annex.Link
 import Git.HashObject
@@ -86,7 +88,7 @@ originalBranch = fmap getorig <$> inRepo Git.Branch.current
 enterAdjustedBranch :: Adjustment -> Annex ()
 enterAdjustedBranch adj = go =<< originalBranch
   where
-	go (Just origbranch) = do
+	go (Just origbranch) = preventCommits $ do
 		adjbranch <- adjustBranch adj origbranch
 		inRepo $ Git.Command.run
 			[ Param "checkout"
@@ -109,6 +111,19 @@ adjust adj orig = do
 	liftIO $ hashObjectStop h
 	commitAdjustedTree treesha orig
 
+{- Locks git's index file, preventing git from making a commit, merge, 
+ - or otherwise changing the HEAD ref while the action is run.
+ -
+ - Throws an IO exception if the index file is already locked.
+ -}
+preventCommits :: Annex a -> Annex a
+preventCommits = bracket setup cleanup . const
+  where
+	setup = do
+		lck <- fromRepo indexFileLock
+		liftIO $ Git.LockFile.openLock lck
+	cleanup lckhandle = liftIO $ Git.LockFile.closeLock lckhandle
+
 {- Commits a given adjusted tree, with the provided parent ref.
  -
  - This should always yield the same value, even if performed in different 
@@ -129,8 +144,8 @@ commitAdjustedTree treesha parent = go =<< catCommit parent
 {- Update the currently checked out adjusted branch, merging the provided
  - branch into it. -}
 updateAdjustedBranch :: Branch -> (OrigBranch, Adjustment) -> Git.Branch.CommitMode -> Annex Bool
-updateAdjustedBranch tomerge (origbranch, adj) commitmode =
-	go =<< (,)
+updateAdjustedBranch tomerge (origbranch, adj) commitmode = 
+	catchBoolIO $ preventCommits $ go =<< (,)
 		<$> inRepo (Git.Ref.sha tomerge)
 		<*> inRepo Git.Branch.current
   where
-- 
cgit v1.2.3