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

Ensure that core.sharedrepository is honored when creating the .git/annex directory.

Browse source
This commit is contained in:
Joey Hess 2013-11-18 18:20:20 -04:00
parent 310c549b5a
commit b876df6fdb
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/Branch.hs
View file

@ -351,7 +351,7 @@ withIndex' bootstrapping a = do
Annex.changeState $ \s -> s { Annex.repo = g' } Annex.changeState $ \s -> s { Annex.repo = g' }
checkIndexOnce $ unlessM (liftIO $ doesFileExist f) $ do checkIndexOnce $ unlessM (liftIO $ doesFileExist f) $ do
unless bootstrapping create unless bootstrapping create
liftIO $ createDirectoryIfMissing True $ takeDirectory f createAnnexDirectory $ takeDirectory f
unless bootstrapping $ inRepo genIndex unless bootstrapping $ inRepo genIndex
a a
Annex.changeState $ \s -> s { Annex.repo = (Annex.repo s) { gitEnv = gitEnv g} } Annex.changeState $ \s -> s { Annex.repo = (Annex.repo s) { gitEnv = gitEnv g} }

8
Init.hs
View file

@ -29,6 +29,7 @@ import Config
import Annex.Direct import Annex.Direct
import Annex.Content.Direct import Annex.Content.Direct
import Annex.Environment import Annex.Environment
import Annex.Perms
import Backend import Backend
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
import Utility.UserInfo import Utility.UserInfo
@ -111,9 +112,8 @@ probeCrippledFileSystem = do
#else #else
tmp <- fromRepo gitAnnexTmpDir tmp <- fromRepo gitAnnexTmpDir
let f = tmp </> "gaprobe" let f = tmp </> "gaprobe"
liftIO $ do createAnnexDirectory tmp
createDirectoryIfMissing True tmp liftIO $ writeFile f ""
writeFile f ""
uncrippled <- liftIO $ probe f uncrippled <- liftIO $ probe f
liftIO $ removeFile f liftIO $ removeFile f
return $ not uncrippled return $ not uncrippled
@ -149,8 +149,8 @@ probeFifoSupport = do
#else #else
tmp <- fromRepo gitAnnexTmpDir tmp <- fromRepo gitAnnexTmpDir
let f = tmp </> "gaprobe" let f = tmp </> "gaprobe"
createAnnexDirectory tmp
liftIO $ do liftIO $ do
createDirectoryIfMissing True tmp
nukeFile f nukeFile f
ms <- tryIO $ do ms <- tryIO $ do
createNamedPipe f ownerReadMode createNamedPipe f ownerReadMode

4
debian/changelog vendored
View file

@ -2,7 +2,9 @@ git-annex (5.20131119) UNRELEASED; urgency=low
* dropunused, addunused: Allow "all" instead of a range to * dropunused, addunused: Allow "all" instead of a range to
act on all unused data. 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 -- Joey Hess <joeyh@debian.org> Mon, 18 Nov 2013 17:09:21 -0400