#1550. Fixes scripted/join that broke with #1546

Name hashing is now turned on by default, so I’m changing the value for inc.Relations.empty, so inc.Analysis.empty functions as expected when it’s joined with name hashing analyses.
sbt · Aug 22, 2014 · 1120522 · 1120522
1 parent 6fa61e9
commit 1120522
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/compile/inc/src/main/scala/sbt/inc/IncOptions.scala b/compile/inc/src/main/scala/sbt/inc/IncOptions.scala
@@ -217,7 +217,7 @@ final class IncOptions(
 
 object IncOptions extends Serializable {
   private val recompileOnMacroDefDefault: Boolean = true
-  private val nameHashingDefault: Boolean = true
+  private[sbt] val nameHashingDefault: Boolean = true
   private val antStyleDefault: Boolean = false
   val Default = IncOptions(
     //    1. recompile changed sources

diff --git a/compile/inc/src/main/scala/sbt/inc/Relations.scala b/compile/inc/src/main/scala/sbt/inc/Relations.scala
@@ -227,7 +227,7 @@ object Relations {
 
   def emptySource: Source = es
   private[inc] lazy val emptySourceDependencies: SourceDependencies = new SourceDependencies(e, estr)
-  def empty: Relations = empty(nameHashing = false)
+  def empty: Relations = empty(nameHashing = IncOptions.nameHashingDefault)
   private[inc] def empty(nameHashing: Boolean): Relations =
     if (nameHashing)
       new MRelationsNameHashing(e, e, emptySourceDependencies, emptySourceDependencies, estr, estr)