diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2023-05-21 17:00:29 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-05-23 19:49:19 +1000 |
commit | 63dc07fdedec58ae5836a601d9c8839d0481eda6 (patch) | |
tree | e49ce7cf9284ebebfd9d4f4d87311418a8993913 /pkg/commands/git_commands/stash_test.go | |
parent | 70e473b25d05d94f07c9d5c7751aaf826e7ad08d (diff) |
Construct arg vector manually rather than parse string
By constructing an arg vector manually, we no longer need to quote arguments
Mandate that args must be passed when building a command
Now you need to provide an args array when building a command.
There are a handful of places where we need to deal with a string,
such as with user-defined custom commands, and for those we now require
that at the callsite they use str.ToArgv to do that. I don't want
to provide a method out of the box for it because I want to discourage its
use.
For some reason we were invoking a command through a shell when amending a
commit, and I don't believe we needed to do that as there was nothing user-
supplied about the command. So I've switched to using a regular command out-
side the shell there
Diffstat (limited to 'pkg/commands/git_commands/stash_test.go')
-rw-r--r-- | pkg/commands/git_commands/stash_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/commands/git_commands/stash_test.go b/pkg/commands/git_commands/stash_test.go index 2fb03b90e..d19c0a519 100644 --- a/pkg/commands/git_commands/stash_test.go +++ b/pkg/commands/git_commands/stash_test.go @@ -103,7 +103,7 @@ func TestStashStashEntryCmdObj(t *testing.T) { index int contextSize int ignoreWhitespace bool - expected string + expected []string } scenarios := []scenario{ @@ -112,21 +112,21 @@ func TestStashStashEntryCmdObj(t *testing.T) { index: 5, contextSize: 3, ignoreWhitespace: false, - expected: "git stash show -p --stat --color=always --unified=3 stash@{5}", + expected: []string{"git", "stash", "show", "-p", "--stat", "--color=always", "--unified=3", "stash@{5}"}, }, { testName: "Show diff with custom context size", index: 5, contextSize: 77, ignoreWhitespace: false, - expected: "git stash show -p --stat --color=always --unified=77 stash@{5}", + expected: []string{"git", "stash", "show", "-p", "--stat", "--color=always", "--unified=77", "stash@{5}"}, }, { testName: "Default case", index: 5, contextSize: 3, ignoreWhitespace: true, - expected: "git stash show -p --stat --color=always --unified=3 --ignore-all-space stash@{5}", + expected: []string{"git", "stash", "show", "-p", "--stat", "--color=always", "--unified=3", "--ignore-all-space", "stash@{5}"}, }, } @@ -137,7 +137,7 @@ func TestStashStashEntryCmdObj(t *testing.T) { userConfig.Git.DiffContextSize = s.contextSize instance := buildStashCommands(commonDeps{userConfig: userConfig}) - cmdStr := instance.ShowStashEntryCmdObj(s.index, s.ignoreWhitespace).ToString() + cmdStr := instance.ShowStashEntryCmdObj(s.index, s.ignoreWhitespace).Args() assert.Equal(t, s.expected, cmdStr) }) } |