diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-05-16 16:08:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-16 16:08:20 -0400 |
| commit | f4b3a2aee0052962f3f82c03f137c62f17d64e18 (patch) | |
| tree | 00ec330f89eebb9ded13689a82e7c2ab1d31c36a /Remote/Git.hs | |
| parent | ce4a677871eb33b5989005f6af209d6384d5f8a8 (diff) | |
factor out getRemoteGitConfig
Diffstat (limited to 'Remote/Git.hs')
| -rw-r--r-- | Remote/Git.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 2a6ed0c77..5b9a72a01 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -87,10 +87,9 @@ list = do - cached UUID value. -} configRead :: Git.Repo -> Annex Git.Repo configRead r = do - g <- fromRepo id - let c = extractRemoteGitConfig g (Git.repoDescribe r) + gc <- Annex.getRemoteGitConfig r u <- getRepoUUID r - case (repoCheap r, remoteAnnexIgnore c, u) of + case (repoCheap r, remoteAnnexIgnore gc, u) of (_, True, _) -> return r (True, _, _) -> tryGitConfigRead r (False, _, NoUUID) -> tryGitConfigRead r |