From aae0417d94c4ae81d28f2301bc1fac61d4f499a4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Nov 2011 11:50:30 -0400 Subject: Don't try to read config from repos with annex-ignore set. --- Remote/Git.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Remote/Git.hs') diff --git a/Remote/Git.hs b/Remote/Git.hs index b0138901d..0cd64c921 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -56,10 +56,11 @@ gen r u _ = do - the config of an URL remote is only read when there is no - cached UUID value. -} let cheap = not $ Git.repoIsUrl r - r' <- case (cheap, u) of - (True, _) -> do - tryGitConfigRead r - (False, "") -> tryGitConfigRead r + notignored <- repoNotIgnored r + r' <- case (cheap, notignored, u) of + (_, False, _) -> return r + (True, _, _) -> tryGitConfigRead r + (False, _, "") -> tryGitConfigRead r _ -> return r u' <- getRepoUUID r' -- cgit v1.2.3