summaryrefslogtreecommitdiff
path: root/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-10-13 00:45:09 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-10-13 00:45:09 -0400
commit14d7b2ac13318ba513bbab4f08b98434741f0e12 (patch)
tree18886135d5de49ed28c9c084010c57676ee54db8 /Annex.hs
parent208bba8d3062133733d27a5db521013e3a2ead57 (diff)
update
Diffstat (limited to 'Annex.hs')
-rw-r--r--Annex.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex.hs b/Annex.hs
index 82efd543d..e5eb1894f 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -34,7 +34,7 @@ startAnnex :: IO State
startAnnex = do
r <- gitRepoFromCwd
r' <- prepUUID r
- gitPrep r'
+ gitSetup r'
return State {
repo = r',
@@ -129,8 +129,8 @@ annexPullRepo :: State -> String -> IO ()
annexPullRepo state reponame = do error "not implemented" -- TODO
{- Sets up a git repo for git-annex. May be called repeatedly. -}
-gitPrep :: GitRepo -> IO ()
-gitPrep repo = do
+gitSetup :: GitRepo -> IO ()
+gitSetup repo = do
-- configure git to use union merge driver on state files
exists <- doesFileExist attributes
if (not exists)