From 6214408783f96f896998cc9b3214047109ebb1c4 Mon Sep 17 00:00:00 2001
From: Holden Karau <holden@pigscanfly.ca>
Date: Tue, 15 May 2018 05:31:58 -0700
Subject: [PATCH] Add support for --error.

---
 main-command/src/main/scala/sbt/BasicCommandStrings.scala | 6 ++++--
 main-command/src/main/scala/sbt/BasicCommands.scala       | 3 ++-
 sbt/src/sbt-test/actions/early-command/test               | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/main-command/src/main/scala/sbt/BasicCommandStrings.scala b/main-command/src/main/scala/sbt/BasicCommandStrings.scala
index abc2bc9c1..e9e73fba2 100644
--- a/main-command/src/main/scala/sbt/BasicCommandStrings.scala
+++ b/main-command/src/main/scala/sbt/BasicCommandStrings.scala
@@ -67,7 +67,7 @@ $HelpCommand <regular expression>
 	This will be used as the default level for logging from commands, settings, and tasks.
 	Any explicit `logLevel` configuration in a project overrides this setting.
 
--$level
+-$level OR --$level
 
 	Sets the global logging level as described above, but does so before any other commands are executed on startup, including project loading.
 	This is useful as a startup option:
@@ -77,7 +77,9 @@ $HelpCommand <regular expression>
 
   def runEarly(command: String) = s"$EarlyCommand($command)"
   private[sbt] def isEarlyCommand(s: String): Boolean = {
-    val levelOptions = Level.values.toSeq map { "-" + _ }
+    val levelOptions = Level.values.toSeq flatMap { elem =>
+      List("-" + elem, "--" + elem)
+    }
     (s.startsWith(EarlyCommand + "(") && s.endsWith(")")) ||
     (levelOptions contains s)
   }
diff --git a/main-command/src/main/scala/sbt/BasicCommands.scala b/main-command/src/main/scala/sbt/BasicCommands.scala
index 82bb7b883..97ed9d1d6 100644
--- a/main-command/src/main/scala/sbt/BasicCommands.scala
+++ b/main-command/src/main/scala/sbt/BasicCommands.scala
@@ -69,7 +69,8 @@ object BasicCommands {
   private[this] def earlyParser: State => Parser[String] = (s: State) => {
     val p1 = token(EarlyCommand + "(") flatMap (_ => otherCommandParser(s) <~ token(")"))
     val p2 = token("-") flatMap (_ => levelParser)
-    p1 | p2
+    val p3 = token("--") flatMap (_ => levelParser)
+    p1 | p2 | p3
   }
 
   private[this] def earlyHelp = Help(EarlyCommand, EarlyCommandBrief, EarlyCommandDetailed)
diff --git a/sbt/src/sbt-test/actions/early-command/test b/sbt/src/sbt-test/actions/early-command/test
index 532cef013..66e241ad4 100644
--- a/sbt/src/sbt-test/actions/early-command/test
+++ b/sbt/src/sbt-test/actions/early-command/test
@@ -1,2 +1,3 @@
 > -error
 > early(error)
+> --error
\ No newline at end of file