From e3b6c97c3b0d42ad8bde98e696bd66e72a0d7cb4 Mon Sep 17 00:00:00 2001 From: Pete Davison Date: Sun, 24 Jul 2022 15:28:00 +0000 Subject: [PATCH] fix: the merged task should be internal if the task OR the taskfile are internal --- taskfile/merge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taskfile/merge.go b/taskfile/merge.go index 12f3feae..baebad0e 100644 --- a/taskfile/merge.go +++ b/taskfile/merge.go @@ -43,7 +43,7 @@ func Merge(t1, t2 *Taskfile, internal bool, namespaces ...string) error { // have serious side-effects in the future, since we're editing // the original references instead of deep copying them. - v.Internal = internal + v.Internal = v.Internal || internal t1.Tasks[taskNameWithNamespace(k, namespaces...)] = v