diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-17 13:29:51 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-17 13:29:51 -0400 |
| commit | e2b93987143faba2c1f507da436752ef826c5ff3 (patch) | |
| tree | a23a6d48f619686854926b809f2d64dcc7683819 /Annex/Branch.hs | |
| parent | 4efa70598eda24fddf8c3f4bbd86fc96576a5bf1 (diff) | |
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.
Diffstat (limited to 'Annex/Branch.hs')
| -rw-r--r-- | Annex/Branch.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index 1e5800c21..e43c07f8e 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -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 |