diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-09 13:40:21 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-09 13:40:21 -0400 |
| commit | d03284c66e5f356421da06a17bf0e71d7b205157 (patch) | |
| tree | 6b01d20c50b0b98524dae41b05878b30484fcf3f /Remote/Helper | |
| parent | 113f2031dcb04f728cee4bb56fa41aa7b1539c1e (diff) | |
| parent | 425730f03a68cfa6a0e43a88c83f3470d8724627 (diff) | |
Merge branch 'master' into s3-aws
Diffstat (limited to 'Remote/Helper')
| -rw-r--r-- | Remote/Helper/Git.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Remote/Helper/Git.hs b/Remote/Helper/Git.hs index d76cb2ee7..b405fd358 100644 --- a/Remote/Helper/Git.hs +++ b/Remote/Helper/Git.hs @@ -26,7 +26,7 @@ availabilityCalc r {- Avoids performing an action on a local repository that's not usable. - Does not check that the repository is still available on disk. -} -guardUsable :: Git.Repo -> a -> Annex a -> Annex a -guardUsable r onerr a - | Git.repoIsLocalUnknown r = return onerr +guardUsable :: Git.Repo -> Annex a -> Annex a -> Annex a +guardUsable r fallback a + | Git.repoIsLocalUnknown r = fallback | otherwise = a |