summaryrefslogtreecommitdiff
path: root/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-22 23:42:16 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-22 23:42:16 -0400
commit1c5cd5f567001759fad75b4dc1810c5a80b6de3e (patch)
tree9c0e4543b688ccaf82ebaed2007ceb301833dc14 /Annex.hs
parent52ad9a1528bc51f65411aca263def97615367943 (diff)
restart on upgrade now fully working
Diffstat (limited to 'Annex.hs')
-rw-r--r--Annex.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex.hs b/Annex.hs
index 25038228d..842d930c5 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -255,9 +255,9 @@ 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 } }) =
+fixupDirect r@(Repo { location = l@(Local { gitdir = d, worktree = Nothing }) }) =
r
- { location = Local { gitdir = d </> ".git", worktree = Just d }
+ { location = l { worktree = Just (parentDir d) }
, gitGlobalOpts = gitGlobalOpts r ++
[ Param "-c"
, Param $ coreBare ++ "=" ++ boolConfig False