diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2024-03-02 10:24:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-02 10:24:36 +0100 |
| commit | e9b04b8cfc569b10f77ff26b0113b4d2d05fe288 (patch) | |
| tree | 590eec10820fa37e923ba14d198bf17ec6ee8324 | |
| parent | ee5533f9bf101e2ac313f9c0c41b280fb20d967c (diff) | |
| parent | 253a0096f91fc100261030e591a1035b7efefc62 (diff) | |
Allow more than one argument in git.merging.args config (#3336)
- **PR Description**
Fix a bug where merging would fail with an error message when you try to
put more than one argument in the `git.merging.args` config. This broke
with 25f8b0337e.
Fixes #3334.
| -rw-r--r-- | pkg/commands/git_commands/branch.go | 2 | ||||
| -rw-r--r-- | pkg/commands/git_commands/branch_test.go | 13 |
2 files changed, 14 insertions, 1 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 b94f700cc..a6082586c 100644 --- a/pkg/commands/git_commands/branch_test.go +++ b/pkg/commands/git_commands/branch_test.go @@ -128,6 +128,19 @@ func TestBranchMerge(t *testing.T) { expected: []string{"merge", "--no-edit", "--merging-args", "mybranch"}, }, { + testName: "multiple merging args", + userConfig: &config.UserConfig{ + Git: config.GitConfig{ + Merging: config.MergingConfig{ + Args: "--arg1 --arg2", // it's up to the user what they put here + }, + }, + }, + opts: MergeOpts{}, + branchName: "mybranch", + expected: []string{"merge", "--no-edit", "--arg1", "--arg2", "mybranch"}, + }, + { testName: "fast forward only", userConfig: &config.UserConfig{}, opts: MergeOpts{FastForwardOnly: true}, |