go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-15 11:56:37 +02:00
Code Issues Releases Activity

Break git.merging.args config into separate arguments on whitespace

Browse Source 
This makes it possible again to pass multiple arguments, for example
"--ff-only --autostash". This won't work correctly if you want to use
an argument that contains a space, but it's very unlikely that people
will want to do that, so I think this is good enough.
This commit is contained in:
Stefan Haller 2024-02-23 16:03:04 +01:00
parent aa81c456bb
commit 253a0096f9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/git_commands/branch.go
View File

@ -210,7 +210,7 @@ type MergeOpts struct {
func (self *BranchCommands) Merge(branchName string, opts MergeOpts) error { func (self *BranchCommands) Merge(branchName string, opts MergeOpts) error {
cmdArgs := NewGitCmd("merge"). cmdArgs := NewGitCmd("merge").
Arg("--no-edit"). Arg("--no-edit").
ArgIf(self.UserConfig.Git.Merging.Args != "", self.UserConfig.Git.Merging.Args). Arg(strings.Fields(self.UserConfig.Git.Merging.Args)...).
ArgIf(opts.FastForwardOnly, "--ff-only"). ArgIf(opts.FastForwardOnly, "--ff-only").
Arg(branchName). Arg(branchName).
ToArgv() ToArgv()

3
pkg/commands/git_commands/branch_test.go
View File

@ -138,8 +138,7 @@ func TestBranchMerge(t *testing.T) {
}, },
opts: MergeOpts{}, opts: MergeOpts{},
branchName: "mybranch", branchName: "mybranch",
expected: []string{"merge", "--no-edit", "--arg1 --arg2", "mybranch"}, expected: []string{"merge", "--no-edit", "--arg1", "--arg2", "mybranch"},
// This is wrong, we want separate arguments for "--arg1" and "--arg2"
}, },
{ {
testName: "fast forward only", testName: "fast forward only",