mirror of
https://github.com/jesseduffield/lazygit.git
synced 2024-12-12 11:15:00 +02:00
63dc07fded
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
48 lines
1.4 KiB
Go
48 lines
1.4 KiB
Go
package sync
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var FetchPrune = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "Fetch from the remote with the 'prune' option set in the git config",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
// This option makes it so that git checks for deleted branches in the remote
|
|
// upon fetching.
|
|
shell.SetConfig("fetch.prune", "true")
|
|
|
|
shell.EmptyCommit("my commit message")
|
|
|
|
shell.NewBranch("branch_to_remove")
|
|
shell.Checkout("master")
|
|
shell.CloneIntoRemote("origin")
|
|
shell.SetBranchUpstream("master", "origin/master")
|
|
shell.SetBranchUpstream("branch_to_remove", "origin/branch_to_remove")
|
|
|
|
// # unbenownst to our test repo we're removing the branch on the remote, so upon
|
|
// # fetching with prune: true we expect git to realise the remote branch is gone
|
|
shell.RemoveRemoteBranch("origin", "branch_to_remove")
|
|
},
|
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
|
t.Views().Branches().
|
|
Lines(
|
|
Contains("master"),
|
|
Contains("branch_to_remove").DoesNotContain("upstream gone"),
|
|
)
|
|
|
|
t.Views().Files().
|
|
IsFocused().
|
|
Press(keys.Files.Fetch)
|
|
|
|
t.Views().Branches().
|
|
Lines(
|
|
Contains("master"),
|
|
Contains("branch_to_remove").Contains("upstream gone"),
|
|
)
|
|
},
|
|
})
|