disable core.symlinks before enabling direct mode
This commit is contained in:
parent
03eec12cff
commit
61a17fdc84
1 changed files with 8 additions and 8 deletions
16
Init.hs
16
Init.hs
|
@ -151,6 +151,14 @@ checkCrippledFileSystem = whenM probeCrippledFileSystem $ do
|
||||||
warning "Detected a crippled filesystem."
|
warning "Detected a crippled filesystem."
|
||||||
setCrippledFileSystem True
|
setCrippledFileSystem True
|
||||||
|
|
||||||
|
{- Normally git disables core.symlinks itself when the filesystem does
|
||||||
|
- not support them, but in Cygwin, git does support symlinks, while
|
||||||
|
- git-annex, not linking with Cygwin, does not. -}
|
||||||
|
whenM (coreSymlinks <$> Annex.getGitConfig) $ do
|
||||||
|
warning "Disabling core.symlinks."
|
||||||
|
setConfig (ConfigKey "core.symlinks")
|
||||||
|
(Git.Config.boolConfig False)
|
||||||
|
|
||||||
unlessM isDirect $ do
|
unlessM isDirect $ do
|
||||||
warning "Enabling direct mode."
|
warning "Enabling direct mode."
|
||||||
top <- fromRepo Git.repoPath
|
top <- fromRepo Git.repoPath
|
||||||
|
@ -161,14 +169,6 @@ checkCrippledFileSystem = whenM probeCrippledFileSystem $ do
|
||||||
setDirect True
|
setDirect True
|
||||||
setVersion directModeVersion
|
setVersion directModeVersion
|
||||||
|
|
||||||
{- Normally git disables core.symlinks itself when the filesystem does
|
|
||||||
- not support them, but in Cygwin, git does support symlinks, while
|
|
||||||
- git-annex, not linking with Cygwin, does not. -}
|
|
||||||
whenM (coreSymlinks <$> Annex.getGitConfig) $ do
|
|
||||||
warning "Disabling core.symlinks."
|
|
||||||
setConfig (ConfigKey "core.symlinks")
|
|
||||||
(Git.Config.boolConfig False)
|
|
||||||
|
|
||||||
probeFifoSupport :: Annex Bool
|
probeFifoSupport :: Annex Bool
|
||||||
probeFifoSupport = do
|
probeFifoSupport = do
|
||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue