Evaluate included taskfiles in order of declaration

Closes #393
2025-11-29 22:48:03 +02:00 · 2021-01-01 18:27:50 -03:00
parent 22fd74846d
commit 9674d75ff6
7 changed files with 104 additions and 28 deletions
--- a/taskfile/merge.go
+++ b/taskfile/merge.go
@@ -22,11 +22,9 @@ func Merge(t1, t2 *Taskfile, namespaces ...string) error {
 	}

 	if t1.Includes == nil {
-		t1.Includes = make(IncludedTaskfiles)
-	}
-	for k, v := range t2.Includes {
-		t1.Includes[k] = v
+		t1.Includes = &IncludedTaskfiles{}
 	}
+	t1.Includes.Merge(t2.Includes)

 	if t1.Vars == nil {
 		t1.Vars = &Vars{}