bugfix: restore index file env var

This fixes precommit, since in that hook, git sets the env var to write
to the lock file, which avoids git add failing due to the presence of the
lock file. (Took me a good hour and a half of confusion to figure this out.)

Test suite now passes 100%! Only the upgrade code still remains to be
written.

1 files changed, 10 insertions, 10 deletions

diff --git a/Branch.hs b/Branch.hs
index 2cd658fe8..4f204929e 100644
--- a/Branch.hs
+++ b/Branch.hs
@@ -68,16 +68,19 @@ genIndex g = do
 
 {- Runs an action using the branch's index file. -}
 withIndex :: Annex a -> Annex a
-withIndex a = do
+withIndex = withIndex' False
+withIndex' :: Bool -> Annex a -> Annex a
+withIndex' bootstrapping a = do
 	g <- Annex.gitRepo
 	let f = index g
-	liftIO $ Git.useIndex f
+	reset <- liftIO $ Git.useIndex f
 
-	e <- liftIO $ doesFileExist f
-	unless e $ liftIO $ genIndex g
+	unless bootstrapping $ do
+		e <- liftIO $ doesFileExist f
+		unless e $ liftIO $ genIndex g
 
 	r <- a
-	liftIO $ Git.useDefaultIndex
+	liftIO reset
 	return r
 
 withIndexUpdate :: Annex a -> Annex a
@@ -121,11 +124,8 @@ create = do
 		inorigin <- refexists origin
 		if inorigin
 			then liftIO $ Git.run g "branch" [Param name, Param origin]
-			else liftIO $ do
-				let f = index g
-				liftIO $ Git.useIndex f
-				GitUnionMerge.commit g "branch created" fullname []
-				liftIO $ Git.useDefaultIndex
+			else withIndex' True $
+				liftIO $ GitUnionMerge.commit g "branch created" fullname []
 	where
 		origin = "origin/" ++ name
 		refexists ref = do