mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 04:45:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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
Download patch file Download diff file Expand all files Collapse all files

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

@ -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",