Skip to content

Add signoff flag to revert action #5092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChrisMcD1 wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −10
Open

Add signoff flag to revert action #5092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99c5027
Add signoff flag to revert, merge, and cherrypick
ArkoselabsDoesNotWork-215640955 Dec 7, 2025
acf07e2
Inline self.signoffFlag helper
ArkoselabsDoesNotWork-215640955 Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/commands/git_commands/branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
14 changes: 4 additions & 10 deletions pkg/commands/git_commands/commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (self *CommitCommands) CommitCmdObj(summary string, description string, for
skipHookPrefix := self.UserConfig().Git.SkipHookPrefix
cmdArgs := NewGitCmd("commit").
ArgIf(forceSkipHooks || (skipHookPrefix != "" && strings.HasPrefix(summary, skipHookPrefix)), "--no-verify").
ArgIf(self.signoffFlag() != "", self.signoffFlag()).
ArgIf(self.UserConfig().Git.Commit.SignOff, "--signoff").
Arg(messageArgs...).
ToArgv()

Expand All @@ -111,7 +111,7 @@ func (self *CommitCommands) CommitInEditorWithMessageFileCmdObj(tmpMessageFile s
ArgIf(forceSkipHooks, "--no-verify").
Arg("--edit").
Arg("--file="+tmpMessageFile).
ArgIf(self.signoffFlag() != "", self.signoffFlag()).
ArgIf(self.UserConfig().Git.Commit.SignOff, "--signoff").
ToArgv())
}

Expand Down Expand Up @@ -140,19 +140,12 @@ func (self *CommitCommands) commitMessageArgs(summary string, description string
// runs git commit without the -m argument meaning it will invoke the user's editor
func (self *CommitCommands) CommitEditorCmdObj() *oscommands.CmdObj {
cmdArgs := NewGitCmd("commit").
ArgIf(self.signoffFlag() != "", self.signoffFlag()).
ArgIf(self.UserConfig().Git.Commit.SignOff, "--signoff").
ToArgv()

return self.cmd.New(cmdArgs)
}

func (self *CommitCommands) signoffFlag() string {
if self.UserConfig().Git.Commit.SignOff {
return "--signoff"
}
return ""
}

func (self *CommitCommands) GetCommitMessage(commitHash string) (string, error) {
cmdArgs := NewGitCmd("log").
Arg("--format=%B", "--max-count=1", commitHash).
Expand Down Expand Up @@ -279,6 +272,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()

Expand Down
1 change: 1 addition & 0 deletions pkg/commands/git_commands/rebase.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() }))...).
Expand Down