diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-18 18:20:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-18 18:20:20 -0400 |
| commit | f329c56f5e356bfaaf04d0587058824713d9b1c9 (patch) | |
| tree | a2e099715eddf9120b388ce5de36c5db814181b5 | |
| parent | 891868cf0185b8a1b81a8a39cd88ce2e00cdc338 (diff) | |
Ensure that core.sharedrepository is honored when creating the .git/annex directory.
| -rw-r--r-- | Annex/Branch.hs | 2 | ||||
| -rw-r--r-- | Init.hs | 8 | ||||
| -rw-r--r-- | debian/changelog | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index 22ab002fe..9838af25f 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -351,7 +351,7 @@ withIndex' bootstrapping a = do Annex.changeState $ \s -> s { Annex.repo = g' } checkIndexOnce $ unlessM (liftIO $ doesFileExist f) $ do unless bootstrapping create - liftIO $ createDirectoryIfMissing True $ takeDirectory f + createAnnexDirectory $ takeDirectory f unless bootstrapping $ inRepo genIndex a Annex.changeState $ \s -> s { Annex.repo = (Annex.repo s) { gitEnv = gitEnv g} } @@ -29,6 +29,7 @@ import Config import Annex.Direct import Annex.Content.Direct import Annex.Environment +import Annex.Perms import Backend #ifndef mingw32_HOST_OS import Utility.UserInfo @@ -111,9 +112,8 @@ probeCrippledFileSystem = do #else tmp <- fromRepo gitAnnexTmpDir let f = tmp </> "gaprobe" - liftIO $ do - createDirectoryIfMissing True tmp - writeFile f "" + createAnnexDirectory tmp + liftIO $ writeFile f "" uncrippled <- liftIO $ probe f liftIO $ removeFile f return $ not uncrippled @@ -149,8 +149,8 @@ probeFifoSupport = do #else tmp <- fromRepo gitAnnexTmpDir let f = tmp </> "gaprobe" + createAnnexDirectory tmp liftIO $ do - createDirectoryIfMissing True tmp nukeFile f ms <- tryIO $ do createNamedPipe f ownerReadMode diff --git a/debian/changelog b/debian/changelog index 85d468989..919407551 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,9 @@ git-annex (5.20131119) UNRELEASED; urgency=low * dropunused, addunused: Allow "all" instead of a range to act on all unused data. - * Ensure execute bit is set on directories when core.sharedrepsitory is set. + * Ensure execute bit is set on directories when core.sharedrepository is set. + * Ensure that core.sharedrepository is honored when creating the .git/annex + directory. -- Joey Hess <joeyh@debian.org> Mon, 18 Nov 2013 17:09:21 -0400 |