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/integration/tests/reflog | |
| 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/integration/tests/reflog')
| -rw-r--r-- | pkg/integration/tests/reflog/checkout.go | 2 | ||||
| -rw-r--r-- | pkg/integration/tests/reflog/cherry_pick.go | 2 | ||||
| -rw-r--r-- | pkg/integration/tests/reflog/patch.go | 2 | ||||
| -rw-r--r-- | pkg/integration/tests/reflog/reset.go | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkg/integration/tests/reflog/checkout.go b/pkg/integration/tests/reflog/checkout.go index 9307ab609..29af72449 100644 --- a/pkg/integration/tests/reflog/checkout.go +++ b/pkg/integration/tests/reflog/checkout.go @@ -7,7 +7,7 @@ import ( var Checkout = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Checkout a reflog commit as a detached head", - ExtraCmdArgs: "", + ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { diff --git a/pkg/integration/tests/reflog/cherry_pick.go b/pkg/integration/tests/reflog/cherry_pick.go index cc7f503e2..4167f06a9 100644 --- a/pkg/integration/tests/reflog/cherry_pick.go +++ b/pkg/integration/tests/reflog/cherry_pick.go @@ -7,7 +7,7 @@ import ( var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Cherry pick a reflog commit", - ExtraCmdArgs: "", + ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { diff --git a/pkg/integration/tests/reflog/patch.go b/pkg/integration/tests/reflog/patch.go index 568f36c43..cce33962c 100644 --- a/pkg/integration/tests/reflog/patch.go +++ b/pkg/integration/tests/reflog/patch.go @@ -7,7 +7,7 @@ import ( var Patch = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Build a patch from a reflog commit and apply it", - ExtraCmdArgs: "", + ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { diff --git a/pkg/integration/tests/reflog/reset.go b/pkg/integration/tests/reflog/reset.go index 80c11cbb7..550be5607 100644 --- a/pkg/integration/tests/reflog/reset.go +++ b/pkg/integration/tests/reflog/reset.go @@ -7,7 +7,7 @@ import ( var Reset = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Hard reset to a reflog commit", - ExtraCmdArgs: "", + ExtraCmdArgs: []string{}, Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { |