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

Merge branch 'master' into relativepaths

Browse source 
Conflicts:
	Locations.hs
	debian/changelog
This commit is contained in:
Joey Hess 2015-01-06 19:00:01 -04:00
commit 858d776352
61 changed files with 238 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/Content/Direct.hs
View file

@ -247,7 +247,7 @@ sentinalStatus = maybe check return =<< Annex.getState Annex.sentinalstatus
createInodeSentinalFile :: Annex ()
createInodeSentinalFile = unlessM (alreadyexists <||> hasobjects) $ do
s <- annexSentinalFile
createAnnexDirectory (parentDir (sentinalFile s))
createAnnexDirectory (takeDirectory (sentinalFile s))
liftIO $ writeSentinalFile s
where
alreadyexists = liftIO. sentinalFileExists =<< annexSentinalFile