summaryrefslogtreecommitdiff
path: root/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-05-18 18:20:53 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-05-18 18:20:53 -0400
commiteb6cb1b87f2d7016ddd4386e2a3bb20d8ea3c036 (patch)
tree1f9f35e7ca3db662bd67ec759de90267149319fa /Annex.hs
parentbb4f31a0ee496ffb83d31cc56f8827e47605d763 (diff)
Add support for core.worktree, and fix support for GIT_WORK_TREE and GIT_DIR.
The environment needs to override git-config. Changed when git config is read, and avoid rereading it once it's been read. chdir for both worktree settings.
Diffstat (limited to 'Annex.hs')
-rw-r--r--Annex.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Annex.hs b/Annex.hs
index d1509d4bd..a9cc68012 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -124,7 +124,8 @@ newState gitrepo = AnnexState
, cleanup = M.empty
}
-{- Create and returns an Annex state object for the specified git repo. -}
+{- Makes an Annex state object for the specified git repo.
+ - Ensures the config is read, if it was not already. -}
new :: Git.Repo -> IO AnnexState
new gitrepo = newState <$> Git.Config.read gitrepo