go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-08-10 22:42:19 +02:00
Code Issues Releases Activity

fix: add missing nil check (#971)

Browse Source 
Co-authored-by: Andrey Nering <andrey@nering.com.br>
This commit is contained in:
Pete Davison
2022-12-31 10:54:26 -06:00
committed by GitHub
parent 796097e3ab
commit c4766e2611
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -4,6 +4,8 @@
- Small bug fix: closing "Taskfile.yml" once we're done reading it - Small bug fix: closing "Taskfile.yml" once we're done reading it
([#963](https://github.com/go-task/task/issues/963), [#964](https://github.com/go-task/task/pull/964) by @HeCorr). ([#963](https://github.com/go-task/task/issues/963), [#964](https://github.com/go-task/task/pull/964) by @HeCorr).
- Fixes a bug in v2 that caused a panic when using a `Taskfile_{{OS}}.yml` file
([#961](https://github.com/go-task/task/issues/961), [#971](https://github.com/go-task/task/pull/971) by @pd93).
- Fixed a bug where watch intervals set in the Taskfile were not being respected ([#969](https://github.com/go-task/task/pull/969), [#970](https://github.com/go-task/task/pull/970) by @pd93) - Fixed a bug where watch intervals set in the Taskfile were not being respected ([#969](https://github.com/go-task/task/pull/969), [#970](https://github.com/go-task/task/pull/970) by @pd93)
- Add `--json` flag (alias `-j`) with the intent to improve support for code - Add `--json` flag (alias `-j`) with the intent to improve support for code
editors and add room to other possible integrations. This is basic for now, editors and add room to other possible integrations. This is basic for now,

2
taskfile/merge.go
View File

@@ -45,7 +45,7 @@ func Merge(t1, t2 *Taskfile, includedTaskfile *IncludedTaskfile, namespaces ...s
// Set the task to internal if EITHER the included task or the included // Set the task to internal if EITHER the included task or the included
// taskfile are marked as internal // taskfile are marked as internal
task.Internal = task.Internal || includedTaskfile.Internal task.Internal = task.Internal || (includedTaskfile != nil && includedTaskfile.Internal)
// Add namespaces to dependencies, commands and aliases // Add namespaces to dependencies, commands and aliases
for _, dep := range task.Deps { for _, dep := range task.Deps {