diff options
author | 2013-11-22 23:42:16 -0400 | |
---|---|---|
committer | 2013-11-22 23:42:16 -0400 | |
commit | 1c5cd5f567001759fad75b4dc1810c5a80b6de3e (patch) | |
tree | 9c0e4543b688ccaf82ebaed2007ceb301833dc14 | |
parent | 52ad9a1528bc51f65411aca263def97615367943 (diff) |
restart on upgrade now fully working
-rw-r--r-- | Annex.hs | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |