Ensure that core.sharedrepository is honored when creating the .git/annex directory.
This commit is contained in:
parent
310c549b5a
commit
b876df6fdb
3 changed files with 8 additions and 6 deletions
|
@ -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} }
|
||||
|
|
8
Init.hs
8
Init.hs
|
@ -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
|
||||
|
|
4
debian/changelog
vendored
4
debian/changelog
vendored
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue