diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-05-18 18:20:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-05-18 18:20:53 -0400 |
| commit | eb6cb1b87f2d7016ddd4386e2a3bb20d8ea3c036 (patch) | |
| tree | 1f9f35e7ca3db662bd67ec759de90267149319fa /GitAnnex.hs | |
| parent | bb4f31a0ee496ffb83d31cc56f8827e47605d763 (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 'GitAnnex.hs')
| -rw-r--r-- | GitAnnex.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/GitAnnex.hs b/GitAnnex.hs index 0e707b186..9910e33d2 100644 --- a/GitAnnex.hs +++ b/GitAnnex.hs @@ -11,7 +11,7 @@ import System.Console.GetOpt import Common.Annex import qualified Git.Config -import qualified Git.Construct +import qualified Git.CurrentRepo import CmdLine import Command import Types.TrustLevel @@ -133,4 +133,4 @@ header :: String header = "Usage: git-annex command [option ..]" run :: [String] -> IO () -run args = dispatch True args cmds options header Git.Construct.fromCurrent +run args = dispatch True args cmds options header Git.CurrentRepo.get |