1
0
mirror of https://github.com/go-task/task.git synced 2025-06-27 00:51:05 +02:00

fix(#612): Add nil check for included cmd

This commit is contained in:
Margus Kerma
2021-11-26 11:20:05 +02:00
parent 17e18442ab
commit b6016b244e
4 changed files with 26 additions and 9 deletions

View File

@ -1033,6 +1033,7 @@ func TestIgnoreNilElements(t *testing.T) {
}{ }{
{"nil cmd", "testdata/ignore_nil_elements/cmds"}, {"nil cmd", "testdata/ignore_nil_elements/cmds"},
{"nil dep", "testdata/ignore_nil_elements/deps"}, {"nil dep", "testdata/ignore_nil_elements/deps"},
{"nil include", "testdata/ignore_nil_elements/includes"},
{"nil precondition", "testdata/ignore_nil_elements/preconditions"}, {"nil precondition", "testdata/ignore_nil_elements/preconditions"},
} }

View File

@ -49,7 +49,7 @@ func Merge(t1, t2 *Taskfile, namespaces ...string) error {
dep.Task = taskNameWithNamespace(dep.Task, namespaces...) dep.Task = taskNameWithNamespace(dep.Task, namespaces...)
} }
for _, cmd := range v.Cmds { for _, cmd := range v.Cmds {
if cmd.Task != "" { if cmd != nil && cmd.Task != "" {
cmd.Task = taskNameWithNamespace(cmd.Task, namespaces...) cmd.Task = taskNameWithNamespace(cmd.Task, namespaces...)
} }
} }

View File

@ -0,0 +1,9 @@
version: '3'
includes:
inc: inc.yml
tasks:
default:
cmds:
- task: inc:default

View File

@ -0,0 +1,7 @@
version: '3'
tasks:
default:
cmds:
-
- echo "string-slice-1"