diff options
| -rw-r--r-- | pkg/commands/git_commands/branch.go | 2 | ||||
| -rw-r--r-- | pkg/commands/git_commands/branch_test.go | 3 |
2 files changed, 2 insertions, 3 deletions
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() diff --git a/pkg/commands/git_commands/branch_test.go b/pkg/commands/git_commands/branch_test.go index 7dcb7f6d6..a6082586c 100644 --- a/pkg/commands/git_commands/branch_test.go +++ b/pkg/commands/git_commands/branch_test.go @@ -138,8 +138,7 @@ func TestBranchMerge(t *testing.T) { }, opts: MergeOpts{}, branchName: "mybranch", - expected: []string{"merge", "--no-edit", "--arg1 --arg2", "mybranch"}, - // This is wrong, we want separate arguments for "--arg1" and "--arg2" + expected: []string{"merge", "--no-edit", "--arg1", "--arg2", "mybranch"}, }, { testName: "fast forward only", |