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 | |
| 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.
| -rw-r--r-- | Command/Map.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/broken_git_annex_map_on_direct_mode.mdwn | 2 |
3 files changed, 6 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 diff --git a/debian/changelog b/debian/changelog index 9e7a06db8..7ccb29ee8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/doc/bugs/broken_git_annex_map_on_direct_mode.mdwn b/doc/bugs/broken_git_annex_map_on_direct_mode.mdwn index 2f9431063..40005a60a 100644 --- a/doc/bugs/broken_git_annex_map_on_direct_mode.mdwn +++ b/doc/bugs/broken_git_annex_map_on_direct_mode.mdwn @@ -54,3 +54,5 @@ git annex map # End of transcript or log. """]] + +> [[fixed|done]]; thanks for a good test case. --[[Joey]] |