diff --git a/Annex/Url.hs b/Annex/Url.hs index 7338aecbd1..ca1d81f393 100644 --- a/Annex/Url.hs +++ b/Annex/Url.hs @@ -59,8 +59,8 @@ getUrlOptions = Annex.getState Annex.urloptions >>= \case -- it from accessing specific IP addresses. curlopts <- map Param . annexWebOptions <$> Annex.getGitConfig let urldownloader = if null curlopts - then U.DownloadWithCurl curlopts - else U.DownloadWithConduit + then U.DownloadWithConduit + else U.DownloadWithCurl curlopts manager <- liftIO $ U.newManager U.managerSettings return (urldownloader, manager) allowedaddrs -> do diff --git a/CHANGELOG b/CHANGELOG index 07e910a919..f063b3e908 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ git-annex (6.20180927) UNRELEASED; urgency=medium tree because export tracking is not configured. * Improve display when git config download from a http remote fails. * Added annex.jobs setting, which is like using the -J option. + * Fix reversion in support of annex.web-options. -- Joey Hess Thu, 27 Sep 2018 15:27:20 -0400