rayan/go-task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2026-06-25 05:35:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: advanced import operates on including file instead of included file

Browse Source
This commit is contained in:
Pete Davison
2024-03-19 15:02:32 +00:00
parent 8f3180a9fa
commit e9448bd4be
6 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
taskfile/ast/taskfile.go
View File

@@ -52,9 +52,9 @@ func (t1 *Taskfile) Merge(t2 *Taskfile, include *Include) error {
if t1.Env == nil {
t1.Env = &Vars{}
}
t1.Vars.Merge(t2.Vars)
t1.Env.Merge(t2.Env)
t1.Tasks.Merge(t2.Tasks, include)
t1.Vars.Merge(t2.Vars, include)
t1.Env.Merge(t2.Env, include)
t1.Tasks.Merge(t2.Tasks, include, t1.Vars)
return nil
}