This commit is contained in:
Joey Hess 2012-06-12 11:32:06 -04:00
parent 85f0992c03
commit 942d8f7298
14 changed files with 20 additions and 21 deletions

View file

@ -114,6 +114,6 @@ getDiskReserve = fromMaybe megabyte . readSize dataUnits
getHttpHeaders :: Annex [String]
getHttpHeaders = do
cmd <- getConfig (annexConfig "http-headers-command") ""
if (null cmd)
if null cmd
then fromRepo $ Git.Config.getList "annex.http-headers"
else lines . snd <$> liftIO (pipeFrom "sh" ["-c", cmd])