diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-18 16:30:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-18 16:30:24 -0400 |
| commit | 1562ec8aba6fd179dd99f88890e2f463e9e15c3c (patch) | |
| tree | 20e31758859c2a75d919cd0605536cf05e10f4fc | |
| parent | b9a9684880e2ee2604240ec6f91273e55dd485e7 (diff) | |
Fix support for remotes with '.' in their names.
(cherry picked from commit 0663f14cf7cb49189352a9c35ce649f3ad10de8b)
Conflicts:
debian/changelog
| -rw-r--r-- | GitRepo.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/GitRepo.hs b/GitRepo.hs index a62d76596..34a59a10d 100644 --- a/GitRepo.hs +++ b/GitRepo.hs @@ -404,7 +404,7 @@ configRemotes repo = mapM construct remotepairs remotepairs = Map.toList $ filterremotes $ config repo filterremotes = Map.filterWithKey (\k _ -> isremote k) isremote k = startswith "remote." k && endswith ".url" k - remotename k = split "." k !! 1 + remotename k = join "." $ reverse $ drop 1 $ reverse $ drop 1 $ split "." k construct (k,v) = do r <- gen v return $ r { remoteName = Just $ remotename k } diff --git a/debian/changelog b/debian/changelog index 4a924be87..893b613be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ git-annex (0.25) UNRELEASED; urgency=low * Fix dropping of files using the URL backend. + * Fix support for remotes with '.' in their names. -- Joey Hess <joeyh@debian.org> Thu, 17 Mar 2011 11:46:53 -0400 |