summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-05 15:13:16 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-05 15:13:16 -0400
commitacde7a1736fdee58be0af0773da6e2d9e0c2d220 (patch)
tree2eae6e51acc7b02cfb58a38437309c2a11d954d5 /Command
parent5c4f90b2d0188abf2aa40e1e5f6d3ecc41e5aa5e (diff)
improve GitRepos functions for pulling apart URL to repo
Diffstat (limited to 'Command')
-rw-r--r--Command/Map.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Map.hs b/Command/Map.hs
index 4d0f90003..b3005e482 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -161,7 +161,7 @@ absRepo reference r
{- Checks if two repos are the same. -}
same :: Git.Repo -> Git.Repo -> Bool
same a b
- | both Git.repoIsSsh = matching Git.urlHostFull && matching Git.workTree
+ | both Git.repoIsSsh = matching Git.urlAuthority && matching Git.workTree
| both Git.repoIsUrl && neither Git.repoIsSsh = matching show
| neither Git.repoIsSsh = matching Git.workTree
| otherwise = False
@@ -210,7 +210,7 @@ tryScan r
"git config --list"
liftIO $ pipedconfig "ssh" $ map Param $
words sshoptions ++
- [Git.urlHostFull r, sshcmd]
+ [Git.urlAuthority r, sshcmd]
-- First, try sshing and running git config manually,
-- only fall back to git-annex-shell configlist if that