summaryrefslogtreecommitdiff
path: root/Init.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-14 14:18:34 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-14 14:18:34 -0400
commit41e6ca8074d82bf92f9378632d55483c3d9e8a8e (patch)
tree6b9564adbe8e755c46efe7ecc237891a2f34d8d8 /Init.hs
parent981aeac8f51e07b3e6757b45076dc2bebe1d5e3a (diff)
disable core.symlinks before enabling direct mode
Diffstat (limited to 'Init.hs')
-rwxr-xr-xInit.hs16
1 files changed, 8 insertions, 8 deletions
diff --git a/Init.hs b/Init.hs
index 058ce9f0a..b66927435 100755
--- a/Init.hs
+++ b/Init.hs
@@ -151,6 +151,14 @@ checkCrippledFileSystem = whenM probeCrippledFileSystem $ do
warning "Detected a crippled filesystem."
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
warning "Enabling direct mode."
top <- fromRepo Git.repoPath
@@ -161,14 +169,6 @@ checkCrippledFileSystem = whenM probeCrippledFileSystem $ do
setDirect True
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 = do
#ifdef __WINDOWS__