rayan/go-task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2026-06-11 09:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: tasks being incorrectly marked as internal

Browse Source
This commit is contained in:
Pete Davison
2023-02-10 17:02:11 +00:00
parent e23dacd6d4
commit 74f69a21cd
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
taskfile/included_taskfile.go
View File

@@ -61,14 +61,6 @@ func (tfs *IncludedTaskfiles) Len() int {
return len(tfs.Keys)
}
// Merge merges the given IncludedTaskfiles into the caller one
func (tfs *IncludedTaskfiles) Merge(other *IncludedTaskfiles) {
_ = other.Range(func(key string, value IncludedTaskfile) error {
tfs.Set(key, value)
return nil
})
}
// Set sets a value to a given key
func (tfs *IncludedTaskfiles) Set(key string, includedTaskfile IncludedTaskfile) {
if tfs.Mapping == nil {

7
taskfile/merge.go
View File

@@ -5,7 +5,7 @@ import (
"strings"
)
// NamespaceSeparator contains the character that separates namescapes
// NamespaceSeparator contains the character that separates namespaces
const NamespaceSeparator = ":"
// Merge merges the second Taskfile into the first
@@ -21,11 +21,6 @@ func Merge(t1, t2 *Taskfile, includedTaskfile *IncludedTaskfile, namespaces ...s
t1.Output = t2.Output
}
if t1.Includes == nil {
t1.Includes = &IncludedTaskfiles{}
}
t1.Includes.Merge(t2.Includes)
if t1.Vars == nil {
t1.Vars = &Vars{}
}