diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-13 15:36:02 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-13 15:36:02 -0400 |
| commit | ee63d9893e80478087fbd115b54d40f4171321bd (patch) | |
| tree | 1617e159dc6fb10ee0783909a799258e9f9a6365 /Command | |
| parent | f4173970c0ea665a0274332b71a00268c5d6e7f5 (diff) | |
map: Fix display of v5 direct mode repos.
The direct mode guard confused map. So need to run through Annex.new to get
the actual path to the repo.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Map.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Command/Map.hs b/Command/Map.hs index 91f4a0251..575e32122 100644 --- a/Command/Map.hs +++ b/Command/Map.hs @@ -156,7 +156,9 @@ absRepo :: Git.Repo -> Git.Repo -> Annex Git.Repo absRepo reference r | Git.repoIsUrl reference = return $ Git.Construct.localToUrl reference r | Git.repoIsUrl r = return r - | otherwise = liftIO $ Git.Construct.fromAbsPath =<< absPath (Git.repoPath r) + | otherwise = liftIO $ do + r' <- Git.Construct.fromAbsPath =<< absPath (Git.repoPath r) + flip Annex.eval Annex.gitRepo =<< Annex.new r' {- Checks if two repos are the same. -} same :: Git.Repo -> Git.Repo -> Bool |