From 2a87c048b91e32d0c8603fa982c34d94015207f4 Mon Sep 17 00:00:00 2001 From: Erich Fussi Date: Sun, 19 Jan 2025 14:33:42 +0100 Subject: [PATCH] Add '--' to 'git rev-list' to disambiguate branch name from path --- pkg/commands/git_commands/branch.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/commands/git_commands/branch.go b/pkg/commands/git_commands/branch.go index 155471e1e25..85408f1d90c 100644 --- a/pkg/commands/git_commands/branch.go +++ b/pkg/commands/git_commands/branch.go @@ -275,6 +275,7 @@ func (self *BranchCommands) IsBranchMerged(branch *models.Branch, mainBranches * Arg(lo.Map(branchesToCheckAgainst, func(branch string, _ int) string { return fmt.Sprintf("^%s", branch) })...). + Arg("--"). ToArgv() stdout, _, err := self.cmd.New(cmdArgs).RunWithOutputs()