Cannot pass multiple args in git.merging.args config about lazygit

[stefanhaller]

Thanks for reporting, this is a bug that was introduced with 25f8b03.

It looks like the fix might be as simple as this:

diff --git a/pkg/commands/git_commands/branch.go b/pkg/commands/git_commands/branch.go
index b8d562dae..d05738ef3 100644
--- a/pkg/commands/git_commands/branch.go
+++ b/pkg/commands/git_commands/branch.go
@@ -210,7 +210,7 @@ type MergeOpts struct {
 func (self *BranchCommands) Merge(branchName string, opts MergeOpts) error {
 	cmdArgs := NewGitCmd("merge").
 		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").
 		Arg(branchName).
 		ToArgv()

This will not work correctly when you try to set an option that includes a space, but hopefully nobody wants to do that.

I don't have time to make a PR right now, are you up for doing that? If so, please add a new test scenario to TestBranchMerge (in branch_test.go).

[Fed03]

Thanks to you for the quick answer.
I'd gladly open a PR, but I never programmed in Go, sorry mate 😞

[stefanhaller]

No worries. PR is here: #3336