Don't try to read config from repos with annex-ignore set.
This commit is contained in:
parent
f229911715
commit
aae0417d94
2 changed files with 6 additions and 4 deletions
|
@ -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'
|
||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue