go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-31 23:19:40 +02:00
Code Issues Releases Activity

Add '--' to 'git rev-list' to disambiguate branch name from path

Browse Source
This commit is contained in:
Erich Fussi 2025-01-19 14:33:42 +01:00
parent c03b892270
commit 2a87c048b9
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,6 +275,7 @@ func (self *BranchCommands) IsBranchMerged(branch *models.Branch, mainBranches *
Arg(lo.Map(branchesToCheckAgainst, func(branch string, _ int) string { Arg(lo.Map(branchesToCheckAgainst, func(branch string, _ int) string {
return fmt.Sprintf("^%s", branch) return fmt.Sprintf("^%s", branch)
})...). })...).
Arg("--").
ToArgv() ToArgv()
stdout, _, err := self.cmd.New(cmdArgs).RunWithOutputs() stdout, _, err := self.cmd.New(cmdArgs).RunWithOutputs()