fix: regression of #1256

go-task · Sep 12, 2023 · 5919d64 · 5919d64
1 parent 7285cb1
commit 5919d64
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/taskfile/read/dag.go b/taskfile/read/dag.go
@@ -104,7 +104,10 @@ func (dag *TaskfileGraph) Merge() (*taskfile.Taskfile, error) {
 					})
 					for _, task := range vertex.taskfile.Tasks.Values() {
 						task.Dir = filepathext.SmartJoin(mergeOptions.Dir, task.Dir)
-						task.IncludeVars = mergeOptions.Vars
+						if task.IncludeVars == nil {
+							task.IncludeVars = &taskfile.Vars{}
+						}
+						task.IncludeVars.Merge(mergeOptions.Vars)
 						task.IncludedTaskfileVars = vertex.taskfile.Vars
 						task.IncludedTaskfileDir = mergeOptions.Dir
 					}