utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 15:46:26 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add signoff flag to revert, merge, and cherrypick

Browse source
This commit is contained in:
Chris McDonnell 2025-12-06 20:59:20 -05:00
parent 17d03ec8cb
commit 99c502725d
3 changed files with 3 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

@ -277,6 +277,7 @@ func (self *BranchCommands) Merge(branchName string, variant MergeVariant) error
cmdArgs := NewGitCmd("merge").
Arg("--no-edit").
ArgIf(self.UserConfig().Git.Commit.SignOff, "--signoff").
Arg(strings.Fields(self.UserConfig().Git.Merging.Args)...).
Arg(extraArgs...).
Arg(branchName).

1
pkg/commands/git_commands/commit.go
View file

@ -279,6 +279,7 @@ func (self *CommitCommands) ShowFileContentCmdObj(hash string, filePath string)
func (self *CommitCommands) Revert(hashes []string, isMerge bool) error {
cmdArgs := NewGitCmd("revert").
ArgIf(isMerge, "-m", "1").
ArgIf(self.UserConfig().Git.Commit.SignOff, "--signoff").
Arg(hashes...).
ToArgv()

1
pkg/commands/git_commands/rebase.go
View file

@ -558,6 +558,7 @@ func (self *RebaseCommands) CherryPickCommits(commits []*models.Commit) error {
hasMergeCommit := lo.SomeBy(commits, func(c *models.Commit) bool { return c.IsMerge() })
cmdArgs := NewGitCmd("cherry-pick").
Arg("--allow-empty").
ArgIf(self.UserConfig().Git.Commit.SignOff, "--signoff").
ArgIf(self.version.IsAtLeast(2, 45, 0), "--empty=keep", "--keep-redundant-commits").
ArgIf(hasMergeCommit, "-m1").
Arg(lo.Reverse(lo.Map(commits, func(c *models.Commit, _ int) string { return c.Hash() }))...).