From 29039fdf97f541a1077c9af65ccbe09dd2ae2b28 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 14 Oct 2010 21:10:59 -0400
Subject: add flags, and change to subcommand style

---
 git-annex.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'git-annex.hs')

diff --git a/git-annex.hs b/git-annex.hs
index e14739195..cd67242af 100644
--- a/git-annex.hs
+++ b/git-annex.hs
@@ -12,10 +12,10 @@ import qualified GitRepo as Git
 
 main = do
 	args <- getArgs
-	actions <- argvToActions args
+	(flags, actions) <- parseCmd args
 	gitrepo <- Git.repoFromCwd
 	state <- new gitrepo
-	tryRun state $ [setup] ++ actions ++ [shutdown]
+	tryRun state $ [startup flags] ++ actions ++ [shutdown]
 
 {- Runs a list of Annex actions. Catches exceptions, not stopping
  - if some error out, and propigates an overall error status at the end.
-- 
cgit v1.2.3