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

Merge acf07e2bbc into 8924bca76f

Browse source
This commit is contained in:
Chris McDonnell 2026-08-30 13:59:16 -07:00 committed by GitHub
parent 8924bca76f acf07e2bbc
commit 41a169d7ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 10 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).

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

@ -91,7 +91,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()
@ -112,7 +112,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())
}
@ -141,19 +141,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).
@ -272,6 +265,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

@ -560,6 +560,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() }))...).