diff options
author | Joey Hess <joey@kitenet.net> | 2010-10-12 13:12:47 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-10-12 13:12:47 -0400 |
commit | 4fbdb197d524720d1ea77795b33cb5d24152bce9 (patch) | |
tree | 75d6223b2747ad52184d80f7694e170492d92368 /Annex.hs | |
parent | dc1d5e68317b85043c8c30a82f53f78b0a9a9f51 (diff) |
correctness
Diffstat (limited to 'Annex.hs')
-rw-r--r-- | Annex.hs | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -33,11 +33,12 @@ annexDir repo key = gitDir repo ++ "/annex/" ++ key startAnnex :: IO State startAnnex = do r <- gitRepoFromCwd - gitPrep r + r' <- prepUUID r + gitPrep r' return State { - repo = r, - backends = parseBackendList $ gitConfig r "annex.backends" "" + repo = r', + backends = parseBackendList $ gitConfig r' "annex.backends" "" } {- Annexes a file, storing it in a backend, and then moving it into @@ -85,8 +86,6 @@ unannexFile state file = do {- Sets up a git repo for git-annex. May be called repeatedly. -} gitPrep :: GitRepo -> IO () gitPrep repo = do - prepUUID repo - -- configure git to use union merge driver on state files let attrLine = stateLoc ++ "/*.log merge=union" let attributes = gitAttributes repo |