mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

de-Maybe remoteGitConfig

Browse source 
It's always set, so does not need to be a Maybe.
This commit is contained in:
Joey Hess 2017-05-11 16:03:50 -04:00
parent a6416ba232
commit db1600b2de
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Remote/Git.hs
View file

@ -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