diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-13 13:19:20 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-13 13:20:10 -0400 |
| commit | 52cfabcd567a3b15c8217edce752f3a3c59ca5ce (patch) | |
| tree | f0512188b4e56640fcceeec0dddb9c754ed23783 /git-annex.hs | |
| parent | 8e9ddfe41e73662be5c7fd0ebc6432a52b1dd227 (diff) | |
wire tasty's option parser into the main program option parser
This makes bash completion work for git-annex test, and is
generally cleaner.
Diffstat (limited to 'git-annex.hs')
| -rw-r--r-- | git-annex.hs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/git-annex.hs b/git-annex.hs index 17ce807af..ca8eecd2a 100644 --- a/git-annex.hs +++ b/git-annex.hs @@ -13,9 +13,7 @@ import Network.Socket (withSocketsDo) import qualified CmdLine.GitAnnex import qualified CmdLine.GitAnnexShell -#ifdef WITH_TESTSUITE import qualified Test -#endif #ifdef mingw32_HOST_OS import Utility.UserInfo @@ -37,14 +35,7 @@ main = withSocketsDo $ do #else gitannex ps #endif - gitannex ps = -#ifdef WITH_TESTSUITE - case ps of - ("test":ps') -> Test.main ps' - _ -> CmdLine.GitAnnex.run ps -#else - CmdLine.GitAnnex.run ps -#endif + gitannex = CmdLine.GitAnnex.run Test.optParser Test.runner isshell n = takeFileName n == "git-annex-shell" #ifdef mingw32_HOST_OS |