diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-05-11 16:03:50 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-05-11 16:05:01 -0400 |
| commit | 54c524f1660e40e4b302279c7571cf2f9c9d5488 (patch) | |
| tree | 6d0f7f20c7b0f8e0d175715c2b495e7a4b0b25ce /Remote | |
| parent | 60dfbb240d4db6cb1a6f8ca9cf71400d461d8aa5 (diff) | |
de-Maybe remoteGitConfig
It's always set, so does not need to be a Maybe.
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/GCrypt.hs | 2 | ||||
| -rw-r--r-- | Remote/Git.hs | 7 | ||||
| -rw-r--r-- | Remote/P2P.hs | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Remote/GCrypt.hs b/Remote/GCrypt.hs index f1b48cdd2..ba28a7728 100644 --- a/Remote/GCrypt.hs +++ b/Remote/GCrypt.hs @@ -119,7 +119,7 @@ gen' r u c gc = do , config = c , localpath = localpathCalc r , repo = r - , gitconfig = gc { remoteGitConfig = Just $ extractGitConfig r } + , gitconfig = gc { remoteGitConfig = extractGitConfig r } , readonly = Git.repoIsHttp r , availability = availabilityCalc r , remotetype = remote diff --git a/Remote/Git.hs b/Remote/Git.hs index 78213f4f7..5c69473fd 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -165,8 +165,7 @@ gen r u c gc , config = c , localpath = localpathCalc r , repo = r - , gitconfig = gc - { remoteGitConfig = Just $ extractGitConfig r } + , gitconfig = gc { remoteGitConfig = extractGitConfig r } , readonly = Git.repoIsHttp r , availability = availabilityCalc r , remotetype = remote @@ -351,7 +350,7 @@ keyUrls r key = map tourl locs' locs' = map (replace "\\" "/") locs #endif remoteconfig = gitconfig r - cfg = fromJust $ remoteGitConfig remoteconfig + cfg = remoteGitConfig remoteconfig dropKey :: Remote -> Key -> Annex Bool dropKey r key @@ -520,7 +519,7 @@ copyFromRemoteCheap :: Remote -> Key -> AssociatedFile -> FilePath -> Annex Bool copyFromRemoteCheap r key af file | not $ Git.repoIsUrl (repo r) = guardUsable (repo r) (return False) $ liftIO $ do loc <- gitAnnexLocation key (repo r) $ - fromJust $ remoteGitConfig $ gitconfig r + remoteGitConfig $ gitconfig r ifM (doesFileExist loc) ( do absloc <- absPath loc diff --git a/Remote/P2P.hs b/Remote/P2P.hs index ca555c30d..118262b3c 100644 --- a/Remote/P2P.hs +++ b/Remote/P2P.hs @@ -63,7 +63,7 @@ chainGen addr r u c gc = do , config = c , localpath = Nothing , repo = r - , gitconfig = gc { remoteGitConfig = Just $ extractGitConfig r } + , gitconfig = gc { remoteGitConfig = extractGitConfig r } , readonly = False , availability = GloballyAvailable , remotetype = remote |