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.
This commit is contained in:
parent
eaefcd6e7f
commit
7ee87c7bd6
3 changed files with 6 additions and 1 deletions
|
@ -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
|
||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -5,6 +5,7 @@ git-annex (5.20140108) UNRELEASED; urgency=medium
|
|||
* Android: Avoid passing --clobber to busybox wget.
|
||||
* Refuse to build with git older than 1.7.1.1, which is needed for
|
||||
git checkout -B
|
||||
* map: Fix display of v5 direct mode repos.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Wed, 08 Jan 2014 13:13:54 -0400
|
||||
|
||||
|
|
|
@ -54,3 +54,5 @@ git annex map
|
|||
|
||||
# End of transcript or log.
|
||||
"""]]
|
||||
|
||||
> [[fixed|done]]; thanks for a good test case. --[[Joey]]
|
||||
|
|
Loading…
Reference in a new issue