mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Don't try to read config from repos with annex-ignore set.

Browse source
This commit is contained in:
Joey Hess 2011-11-07 11:50:30 -04:00
parent f229911715
commit aae0417d94
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Remote/Git.hs
View file

@ -56,10 +56,11 @@ gen r u _ = do
- the config of an URL remote is only read when there is no - the config of an URL remote is only read when there is no
- cached UUID value. -} - cached UUID value. -}
let cheap = not $ Git.repoIsUrl r let cheap = not $ Git.repoIsUrl r
r' <- case (cheap, u) of notignored <- repoNotIgnored r
(True, _) -> do r' <- case (cheap, notignored, u) of
tryGitConfigRead r (_, False, _) -> return r
(False, "") -> tryGitConfigRead r (True, _, _) -> tryGitConfigRead r
(False, _, "") -> tryGitConfigRead r
_ -> return r _ -> return r
u' <- getRepoUUID r' u' <- getRepoUUID r'

1
debian/changelog vendored
View file

@ -3,6 +3,7 @@ git-annex (3.20111106) UNRELEASED; urgency=low
* merge: Use fast-forward merges when possible. * merge: Use fast-forward merges when possible.
Thanks Valentin Haenel for a test case showing how non-fast-forward Thanks Valentin Haenel for a test case showing how non-fast-forward
merges could result in an ongoing pull/merge/push cycle. 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 -- Joey Hess <joeyh@debian.org> Sun, 06 Nov 2011 14:57:57 -0400