automatically set and unset core.bare when switching to/from direct mode

1 files changed, 9 insertions, 4 deletions

diff --git a/Annex.hs b/Annex.hs
index 1fde4cd42..b634041db 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -45,6 +45,7 @@ import Git.CatFile
 import Git.CheckAttr
 import Git.CheckIgnore
 import Git.SharedRepository
+import Git.Config
 import qualified Git.Queue
 import Types.Backend
 import Types.GitConfig
@@ -254,8 +255,12 @@ withCurrentState a = do
  - Fix up the Repo to be a non-bare repo, and arrange for git commands
  - run by git-annex to be passed parameters that override this setting. -}
 fixupDirect :: Git.Repo -> Git.Repo
-fixupDirect r@(Repo { location = Local { gitdir = d, worktree = Nothing } }) = r
-	{ location = Local { gitdir = d </> ".git", worktree = Just d }
-	, gitGlobalOpts = gitGlobalOpts r ++ [Param "-c", Param "core.bare=false"]
-	}
+fixupDirect r@(Repo { location = Local { gitdir = d, worktree = Nothing } }) =
+	r
+		{ location = Local { gitdir = d </> ".git", worktree = Just d }
+		, gitGlobalOpts = gitGlobalOpts r ++
+			[ Param "-c"
+			, Param $ coreBare ++ "=" ++ boolConfig False
+			]
+		}
 fixupDirect r = r