aboutsummaryrefslogtreecommitdiff
path: root/CmdLine/Option.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-07-10 02:03:03 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-07-10 02:03:03 -0400
commitccd76ebf641ad481e549da97c85f73101a3149fd (patch)
tree254f0d644e4998ff73046de74fa4fa4f91735ec8 /CmdLine/Option.hs
parent56c0bf6c690ffddc4ac561393f4cd21d087b7ddb (diff)
wired up global options
Note that I ran into a problem where parsing the global options looped forever, eating memory. It was somehow caused by stacking combineGlobalSetters inside a combineGlobalSetters. Maybe due to both using "many"? Anyway, changed things to avoid that.
Diffstat (limited to 'CmdLine/Option.hs')
-rw-r--r--CmdLine/Option.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/CmdLine/Option.hs b/CmdLine/Option.hs
index 9cb1d41d4..d28c7a704 100644
--- a/CmdLine/Option.hs
+++ b/CmdLine/Option.hs
@@ -25,8 +25,8 @@ import Types.Messages
import Types.DeferredParse
-- Global options accepted by both git-annex and git-annex-shell sub-commands.
-commonGlobalOptions :: Parser GlobalSetter
-commonGlobalOptions = globalSetters
+commonGlobalOptions :: [Parser GlobalSetter]
+commonGlobalOptions =
[ globalFlag (setforce True)
( long "force"
<> help "allow actions that may lose annexed data"