diff options
author | Joey Hess <joey@kitenet.net> | 2010-10-12 13:10:07 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-10-12 13:10:07 -0400 |
commit | dc1d5e68317b85043c8c30a82f53f78b0a9a9f51 (patch) | |
tree | f276c940a74ea8888e746e61ddb891cf280a2d29 /Annex.hs | |
parent | ea5d7fe07a5c40349e66848fc9cd06a9f748b724 (diff) |
update
Diffstat (limited to 'Annex.hs')
-rw-r--r-- | Annex.hs | 16 |
1 files changed, 2 insertions, 14 deletions
@@ -10,13 +10,12 @@ module Annex ( import System.Posix.Files import System.Directory -import System.Cmd.Utils -import System.IO import GitRepo import Utility import Locations import Backend import BackendList +import UUID import LocationLog -- git-annex's runtime state @@ -86,12 +85,7 @@ unannexFile state file = do {- Sets up a git repo for git-annex. May be called repeatedly. -} gitPrep :: GitRepo -> IO () gitPrep repo = do - -- Make sure that the repo has an annex.uuid setting. - if ("" == gitConfig repo "annex.uuid" "") - then do - uuid <- genUUID - gitRun repo ["config", "annex.uuid", uuid] - else return () + prepUUID repo -- configure git to use union merge driver on state files let attrLine = stateLoc ++ "/*.log merge=union" @@ -108,9 +102,3 @@ gitPrep repo = do appendFile attributes $ attrLine ++ "\n" gitAdd repo attributes else return () - -{- Generates a UUID. There is a library for this, but it's not packaged, - - so use the command line tool. -} -genUUID :: IO String -genUUID = do - pOpen ReadFromPipe "uuid" ["-m"] $ \h -> hGetLine h |