Skip to content

Commit 44a2e8e

Browse files
committed
fix: regression of #1256
1 parent d0060bb commit 44a2e8e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

taskfile/read/dag.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,10 @@ func (dag *TaskfileGraph) Merge() (*taskfile.Taskfile, error) {
104104
})
105105
for _, task := range vertex.taskfile.Tasks.Values() {
106106
task.Dir = filepathext.SmartJoin(mergeOptions.Dir, task.Dir)
107-
task.IncludeVars = mergeOptions.Vars
107+
if task.IncludeVars == nil {
108+
task.IncludeVars = &taskfile.Vars{}
109+
}
110+
task.IncludeVars.Merge(mergeOptions.Vars)
108111
task.IncludedTaskfileVars = vertex.taskfile.Vars
109112
task.IncludedTaskfileDir = mergeOptions.Dir
110113
}

0 commit comments

Comments
 (0)