summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-11-07 11:50:30 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-11-07 11:50:30 -0400
commitaae0417d94c4ae81d28f2301bc1fac61d4f499a4 (patch)
treece570804796eaceece28c9ccb2d6964519407c5a
parentf2299117152955d622d0ae0fcb396e56b1b7866d (diff)
Don't try to read config from repos with annex-ignore set.
-rw-r--r--Remote/Git.hs9
-rw-r--r--debian/changelog1
2 files changed, 6 insertions, 4 deletions
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'
diff --git a/debian/changelog b/debian/changelog
index 57be53c85..c09ca6578 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ git-annex (3.20111106) UNRELEASED; urgency=low
* merge: Use fast-forward merges when possible.
Thanks Valentin Haenel for a test case showing how non-fast-forward
merges could result in an ongoing pull/merge/push cycle.
+ * Don't try to read config from repos with annex-ignore set.
-- Joey Hess <joeyh@debian.org> Sun, 06 Nov 2011 14:57:57 -0400