From 90bda04695dd4dd2314ba023db98c3c236207f19 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 22 Apr 2017 22:59:33 -0400
Subject: [PATCH] Fix += interference with sbt-buildinfo

The macro pattern match was too general. This makes it tighter.

Fixes #3132
---
 main/settings/src/main/scala/sbt/std/TaskMacro.scala    | 3 ++-
 sbt/src/sbt-test/project/plusequals/build.sbt           | 7 +++++++
 sbt/src/sbt-test/project/plusequals/project/plugins.sbt | 1 +
 sbt/src/sbt-test/project/plusequals/test                | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 sbt/src/sbt-test/project/plusequals/build.sbt
 create mode 100644 sbt/src/sbt-test/project/plusequals/project/plugins.sbt
 create mode 100644 sbt/src/sbt-test/project/plusequals/test

diff --git a/main/settings/src/main/scala/sbt/std/TaskMacro.scala b/main/settings/src/main/scala/sbt/std/TaskMacro.scala
index a9879cb35..d0a5b89c3 100644
--- a/main/settings/src/main/scala/sbt/std/TaskMacro.scala
+++ b/main/settings/src/main/scala/sbt/std/TaskMacro.scala
@@ -174,7 +174,8 @@ object TaskMacro {
       val typeArgs = util.typeArgs(ttpe)
       v.tree.tpe match {
         // To allow Initialize[Task[A]] in the position of += RHS, we're going to call "taskValue" automatically.
-        case tpe if typeArgs.nonEmpty && (tpe weak_<:< c.weakTypeOf[Initialize[_]]) =>
+        case tpe if typeArgs.nonEmpty && (typeArgs.head weak_<:< c.weakTypeOf[Task[_]])
+          && (tpe weak_<:< c.weakTypeOf[Initialize[_]]) =>
           c.macroApplication match {
             case Apply(Apply(TypeApply(Select(preT, nmeT), targs), _), _) =>
               val tree = Apply(TypeApply(Select(preT, newTermName("+=").encodedName), TypeTree(typeArgs.head) :: Nil), Select(v.tree, newTermName("taskValue").encodedName) :: Nil)
diff --git a/sbt/src/sbt-test/project/plusequals/build.sbt b/sbt/src/sbt-test/project/plusequals/build.sbt
new file mode 100644
index 000000000..2d2f8e7ea
--- /dev/null
+++ b/sbt/src/sbt-test/project/plusequals/build.sbt
@@ -0,0 +1,7 @@
+// https://github.com/sbt/sbt/issues/3132
+lazy val root = (project in file(".")).
+  enablePlugins(BuildInfoPlugin).
+  settings(
+    buildInfoKeys += name,
+    buildInfoPackage := "hello"
+  )
diff --git a/sbt/src/sbt-test/project/plusequals/project/plugins.sbt b/sbt/src/sbt-test/project/plusequals/project/plugins.sbt
new file mode 100644
index 000000000..22366532f
--- /dev/null
+++ b/sbt/src/sbt-test/project/plusequals/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
diff --git a/sbt/src/sbt-test/project/plusequals/test b/sbt/src/sbt-test/project/plusequals/test
new file mode 100644
index 000000000..5df2af1f3
--- /dev/null
+++ b/sbt/src/sbt-test/project/plusequals/test
@@ -0,0 +1 @@
+> compile