diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-13 15:05:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-13 15:06:49 -0400 |
| commit | 13fff71f2019ae098c3f8532ac2734cb1ab11498 (patch) | |
| tree | f37714c4089df4afac9bf9724c80757e5fd29e6f /GitAnnex.hs | |
| parent | 46588674b081cd4ea5820680d8fc15c81ed175ad (diff) | |
split out three modules from Git
Constructors and configuration make sense in separate modules.
A separate Git.Types is needed to avoid cycles.
Diffstat (limited to 'GitAnnex.hs')
| -rw-r--r-- | GitAnnex.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/GitAnnex.hs b/GitAnnex.hs index 7871638e4..a5b9609b6 100644 --- a/GitAnnex.hs +++ b/GitAnnex.hs @@ -10,7 +10,8 @@ module GitAnnex where import System.Console.GetOpt import Common.Annex -import qualified Git +import qualified Git.Config +import qualified Git.Construct import CmdLine import Command import Types.TrustLevel @@ -125,11 +126,11 @@ options = commonOptions ++ setprint0 v = Annex.changeState $ \s -> s { Annex.print0 = v } setgitconfig :: String -> Annex () setgitconfig v = do - newg <- inRepo $ Git.configStore v + newg <- inRepo $ Git.Config.store v Annex.changeState $ \s -> s { Annex.repo = newg } header :: String header = "Usage: git-annex command [option ..]" run :: [String] -> IO () -run args = dispatch args cmds options header Git.repoFromCwd +run args = dispatch args cmds options header Git.Construct.fromCwd |