1
0
mirror of https://github.com/go-task/task.git synced 2025-05-29 23:17:53 +02:00

fix: merge conflict

This commit is contained in:
Pete Davison 2024-03-10 19:09:27 +00:00
parent a0a2cee218
commit 4774273c98
No known key found for this signature in database
GPG Key ID: 2ABFD790DF2521A2

View File

@ -205,8 +205,8 @@ func (e *Executor) compiledTask(call *ast.Call, evaluateShVars bool) (*ast.Task,
extra["KEY"] = keys[i]
}
newDep := dep.DeepCopy()
newDep.Task = r.ReplaceWithExtra(dep.Task, extra)
newDep.Vars = r.ReplaceVarsWithExtra(dep.Vars, extra)
newDep.Task = templater.ReplaceWithExtra(dep.Task, cache, extra)
newDep.Vars = templater.ReplaceVarsWithExtra(dep.Vars, cache, extra)
new.Deps = append(new.Deps, newDep)
}
continue