fix init reversion when core.sharedRepository = group

init: Fix misbehavior when core.sharedRepository = group that caused it to
enter an adjusted branch. (Reversion in version 8.20210630)

Commit 4b1b9d7a83 made init call
freezeContent in case there was a hook that could prevent writing in
situations where perms don't. But with the above git config, freezeContent
does not prevent write at all. So init needs to do what freezeContent does
with a non-shared git config.

Or init could check for that config, and skip the probing, since it
won't actually be preventing write to any files. But that would make init
too aware if details of Annex.Perms, and also would break if the git config
were changed after init.

Sponsored-by: Dartmouth College's Datalad project
This commit is contained in:
Joey Hess 2021-07-12 10:15:49 -04:00
parent 215aee105d
commit 6a581f8b8b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 25 additions and 5 deletions

View file

@ -25,6 +25,7 @@ import qualified Git
import qualified Git.Config
import qualified Git.Objects
import Git.Types (fromConfigValue)
import Git.ConfigTypes (SharedRepository(..))
import qualified Annex.Branch
import Logs.UUID
import Logs.Trust.Basic
@ -243,8 +244,8 @@ isInitialized = maybe Annex.Branch.hasSibling (const $ return True) =<< getVersi
probeCrippledFileSystem :: Annex Bool
probeCrippledFileSystem = withEventuallyCleanedOtherTmp $ \tmp -> do
(r, warnings) <- probeCrippledFileSystem' tmp
(Just freezeContent)
(Just thawContent)
(Just (freezeContent' UnShared))
(Just (thawContent' UnShared))
mapM_ warning warnings
return r