mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-03 00:57:52 +02:00
implement signoff
Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
This commit is contained in:
committed by
Jesse Duffield
parent
b4ea565c99
commit
fdf0d4a2c3
@ -14,13 +14,17 @@ func (gui *Gui) handleCommitConfirm() error {
|
|||||||
if message == "" {
|
if message == "" {
|
||||||
return gui.createErrorPanel(gui.Tr.CommitWithoutMessageErr)
|
return gui.createErrorPanel(gui.Tr.CommitWithoutMessageErr)
|
||||||
}
|
}
|
||||||
flags := ""
|
flags := []string{}
|
||||||
skipHookPrefix := gui.Config.GetUserConfig().Git.SkipHookPrefix
|
skipHookPrefix := gui.Config.GetUserConfig().Git.SkipHookPrefix
|
||||||
if skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix) {
|
if skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix) {
|
||||||
flags = "--no-verify"
|
flags = append(flags, "--no-verify")
|
||||||
}
|
}
|
||||||
|
|
||||||
cmdStr := gui.GitCommand.CommitCmdStr(message, flags)
|
if gui.Config.GetUserConfig().Git.Commit.SignOff {
|
||||||
|
flags = append(flags, "--signoff")
|
||||||
|
}
|
||||||
|
|
||||||
|
cmdStr := gui.GitCommand.CommitCmdStr(message, strings.Join(flags, " "))
|
||||||
gui.OnRunCommand(oscommands.NewCmdLogEntry(cmdStr, gui.Tr.Spans.Commit, true))
|
gui.OnRunCommand(oscommands.NewCmdLogEntry(cmdStr, gui.Tr.Spans.Commit, true))
|
||||||
_ = gui.returnFromContext()
|
_ = gui.returnFromContext()
|
||||||
return gui.withGpgHandling(cmdStr, gui.Tr.CommittingStatus, func() error {
|
return gui.withGpgHandling(cmdStr, gui.Tr.CommittingStatus, func() error {
|
||||||
|
@ -458,8 +458,14 @@ func (gui *Gui) handleCommitEditorPress() error {
|
|||||||
return gui.promptToStageAllAndRetry(gui.handleCommitEditorPress)
|
return gui.promptToStageAllAndRetry(gui.handleCommitEditorPress)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
args := []string{"commit"}
|
||||||
|
|
||||||
|
if gui.Config.GetUserConfig().Git.Commit.SignOff {
|
||||||
|
args = append(args, "--signoff")
|
||||||
|
}
|
||||||
|
|
||||||
return gui.runSubprocessWithSuspenseAndRefresh(
|
return gui.runSubprocessWithSuspenseAndRefresh(
|
||||||
gui.OSCommand.WithSpan(gui.Tr.Spans.Commit).PrepareSubProcess("git", "commit"),
|
gui.OSCommand.WithSpan(gui.Tr.Spans.Commit).PrepareSubProcess("git", args...),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user