diff options
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/EnableRemote.hs | 10 | ||||
| -rw-r--r-- | Command/InitRemote.hs | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Command/EnableRemote.hs b/Command/EnableRemote.hs index 182527095..be20ea049 100644 --- a/Command/EnableRemote.hs +++ b/Command/EnableRemote.hs @@ -12,6 +12,7 @@ import qualified Logs.Remote import qualified Types.Remote as R import qualified Annex.SpecialRemote import qualified Remote +import qualified Types.Remote as Remote import Logs.UUID import qualified Data.Map as M @@ -43,7 +44,8 @@ start (name:ws) = go =<< Annex.SpecialRemote.findExisting name let fullconfig = config `M.union` c t <- either error return (Annex.SpecialRemote.findType fullconfig) showStart "enableremote" name - next $ perform t u fullconfig + gc <- maybe def Remote.gitconfig <$> Remote.byUUID u + next $ perform t u fullconfig gc unknownNameError :: String -> Annex a unknownNameError prefix = do @@ -56,9 +58,9 @@ unknownNameError prefix = do descm (M.keys m) error $ prefix ++ "\n" ++ msg -perform :: RemoteType -> UUID -> R.RemoteConfig -> CommandPerform -perform t u c = do - (c', u') <- R.setup t (Just u) Nothing c +perform :: RemoteType -> UUID -> R.RemoteConfig -> RemoteGitConfig -> CommandPerform +perform t u c gc = do + (c', u') <- R.setup t (Just u) Nothing c gc next $ cleanup u' c' cleanup :: UUID -> R.RemoteConfig -> CommandCleanup diff --git a/Command/InitRemote.hs b/Command/InitRemote.hs index 1f3d63dbd..05717bc60 100644 --- a/Command/InitRemote.hs +++ b/Command/InitRemote.hs @@ -46,7 +46,7 @@ start (name:ws) = ifM (isJust <$> findExisting name) perform :: RemoteType -> String -> R.RemoteConfig -> CommandPerform perform t name c = do - (c', u) <- R.setup t Nothing Nothing c + (c', u) <- R.setup t Nothing Nothing c def next $ cleanup u name c' cleanup :: UUID -> String -> R.RemoteConfig -> CommandCleanup |