Work around git bug in handling of relative path to GIT_INDEX_FILE when in a subdirectory of the repository.

This affected git annex view. It turns out that some other places
that use GIT_INDEX_FILE were already working around the bug. I removed the
workaround from Annex.Branch since the new workaround will do.
This commit is contained in:
Joey Hess 2016-05-17 13:29:51 -04:00
parent 27000d8af6
commit 93c03b5dd5
Failed to extract signature
4 changed files with 13 additions and 5 deletions

View file

@ -367,7 +367,7 @@ withIndex :: Annex a -> Annex a
withIndex = withIndex' False
withIndex' :: Bool -> Annex a -> Annex a
withIndex' bootstrapping a = do
f <- liftIO . absPath =<< fromRepo gitAnnexIndex
f <- fromRepo gitAnnexIndex
withIndexFile f $ do
checkIndexOnce $ unlessM (liftIO $ doesFileExist f) $ do
unless bootstrapping create