From 01c86636e951217c7c67236a2309c0ac1f1a2f1b Mon Sep 17 00:00:00 2001
From: Andrey Nering <andrey@nering.com.br>
Date: Sun, 28 Nov 2021 15:54:49 -0300
Subject: [PATCH] Add CHANGELOG and minor changes to #613

---
 CHANGELOG.md     | 2 ++
 cmd/task/task.go | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ed89225..e99783ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Quote each `{{.CLI_ARGS}}` argument to prevent one with spaces to become many
+  ([#613](https://github.com/go-task/task/pull/613)).
 - Fix  nil pointer when `cmd:` was left empty
   ([#612](https://github.com/go-task/task/issues/612), [#614](https://github.com/go-task/task/pull/614)).
 - Upgrade [mvdan/sh](https://github.com/mvdan/sh) which contains two
diff --git a/cmd/task/task.go b/cmd/task/task.go
index 0f9f9654..2f7a11c0 100644
--- a/cmd/task/task.go
+++ b/cmd/task/task.go
@@ -206,11 +206,11 @@ func getArgs() ([]string, string, error) {
 		return args, "", nil
 	}
 
-	quotedCliArgs := []string{}
+	var quotedCliArgs []string
 	for _, arg := range args[doubleDashPos:] {
 		quotedCliArg, err := syntax.Quote(arg, syntax.LangBash)
 		if err != nil {
-			return []string{}, "", err
+			return nil, "", err
 		}
 		quotedCliArgs = append(quotedCliArgs, quotedCliArg)
 	}