d6711800ad
It was possible for a interrupted sync or merge in direct mode to leave the work tree out of sync with the last recorded commit. This would result in the next commit seeing files missing from the work tree, and committing their removal. Now, a direct mode merge happens not only in a throwaway work tree, but using a temporary index file, and without any commits or index changes being made until the real work tree has been updated. If the merge is interrupted, the work tree may have some updated files, but worst case a commit will redundantly commit changes that come from the merge. This commit was sponsored by Tony Cantor.
36 lines
779 B
Haskell
36 lines
779 B
Haskell
{- git index file stuff
|
|
-
|
|
- Copyright 2011 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Git.Index where
|
|
|
|
import Common
|
|
import Git
|
|
import Utility.Env
|
|
|
|
{- Forces git to use the specified index file.
|
|
-
|
|
- Returns an action that will reset back to the default
|
|
- index file.
|
|
-
|
|
- Warning: Not thread safe.
|
|
-}
|
|
override :: FilePath -> IO (IO ())
|
|
override index = do
|
|
res <- getEnv var
|
|
void $ setEnv var index True
|
|
return $ void $ reset res
|
|
where
|
|
var = "GIT_INDEX_FILE"
|
|
reset (Just v) = setEnv var v True
|
|
reset _ = unsetEnv var
|
|
|
|
indexFile :: Repo -> FilePath
|
|
indexFile r = localGitDir r </> "index"
|
|
|
|
{- Git locks the index by creating this file. -}
|
|
indexFileLock :: Repo -> FilePath
|
|
indexFileLock r = indexFile r ++ ".lock"
|