mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-10 20:05:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Check for skipping pre-commit hooks in more situations

Browse source
This commit is contained in:
Luka Markušić 2024-04-24 20:37:08 +02:00
parent 4ec41c4414
commit d8cffa314e
2 changed files with 39 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,13 @@ func NewCommitCommands(gitCommon *GitCommon) *CommitCommands {
// ResetAuthor resets the author of the topmost commit
func (self *CommitCommands) ResetAuthor() error {
message, err := self.GetCommitMessage("HEAD")
if err != nil {
return err
}
skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
cmdArgs := NewGitCmd("commit").
ArgIf(skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix), "--no-verify").
Arg("--allow-empty", "--only", "--no-edit", "--amend", "--reset-author").
ToArgv()
@ -31,7 +37,14 @@ func (self *CommitCommands) ResetAuthor() error {
// Sets the commit's author to the supplied value. Value is expected to be of the form 'Name <Email>'
func (self *CommitCommands) SetAuthor(value string) error {
message, err := self.GetCommitMessage("HEAD")
if err != nil {
return err
}
skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
cmdArgs := NewGitCmd("commit").
ArgIf(skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix), "--no-verify").
Arg("--allow-empty", "--only", "--no-edit", "--amend", "--author="+value).
ToArgv()
@ -47,7 +60,10 @@ func (self *CommitCommands) AddCoAuthor(hash string, author string) error {
message = AddCoAuthorToMessage(message, author)
skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
cmdArgs := NewGitCmd("commit").
ArgIf(skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix), "--no-verify").
Arg("--allow-empty", "--amend", "--only", "-m", message).
ToArgv()
@ -100,11 +116,15 @@ func (self *CommitCommands) CommitCmdObj(summary string, description string) osc
}
func (self *CommitCommands) RewordLastCommitInEditorCmdObj() oscommands.ICmdObj {
return self.cmd.New(NewGitCmd("commit").Arg("--allow-empty", "--amend", "--only").ToArgv())
return self.cmd.New(NewGitCmd("commit").
// TODO: how to decide if we should add --no-verify if we're using the editor?
Arg("--allow-empty", "--amend", "--only").ToArgv())
}
func (self *CommitCommands) RewordLastCommitInEditorWithMessageFileCmdObj(tmpMessageFile string) oscommands.ICmdObj {
return self.cmd.New(NewGitCmd("commit").
// TODO: how to decide if we should add --no-verify if we're using the editor?
Arg("--allow-empty", "--amend", "--only", "--edit", "--file="+tmpMessageFile).ToArgv())
}
@ -120,7 +140,10 @@ func (self *CommitCommands) CommitInEditorWithMessageFileCmdObj(tmpMessageFile s
func (self *CommitCommands) RewordLastCommit(summary string, description string) error {
messageArgs := self.commitMessageArgs(summary, description)
skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
cmdArgs := NewGitCmd("commit").
ArgIf(skipHookPrefix != "" && strings.HasPrefix(summary, skipHookPrefix), "--no-verify").
Arg("--allow-empty", "--amend", "--only").
Arg(messageArgs...).
ToArgv()
@ -248,7 +271,15 @@ func (self *CommitCommands) AmendHead() error {
}
func (self *CommitCommands) AmendHeadCmdObj() oscommands.ICmdObj {
message, err := self.GetCommitMessage("HEAD")
if err != nil {
// TODO: what to do here? we can't return err
// return err
}
skipHookPrefix := self.UserConfig.Git.SkipHookPrefix
cmdArgs := NewGitCmd("commit").
ArgIf(skipHookPrefix != "" && strings.HasPrefix(message, skipHookPrefix), "--no-verify").
Arg("--amend", "--no-edit", "--allow-empty").
ToArgv()

23
pkg/integration/tests/commit/commit_skip_hook.go
View file

@ -57,24 +57,15 @@ var CommitSkipHook = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Commits().Focus().Press(keys.Commits.RenameCommit)
t.ExpectPopup().CommitMessagePanel().Type(" (reworded)").Confirm()
/* EXPECTED:
t.Views().Commits().IsFocused().
Lines(
Contains("skip! my commit message (reworded)"),
Contains("initial commit"),
)
ACTUAL:
*/
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Contains("exit status 1")).Confirm()
t.Views().Commits().IsFocused().
Lines(
Contains("skip! my commit message (reworded)"),
Contains("initial commit"),
)
// we should be able to skip hooks when changing authors
t.Views().Commits().IsFocused().SelectedLine(Contains("CI").IsSelected())
t.Views().Commits().IsFocused().SelectedLine(Contains("JS").IsSelected())
t.Views().Commits().Focus().Press(keys.Commits.ResetCommitAuthor)
/* EXPECTED:
t.Views().Commits().IsFocused().Lines(Contains("JS").IsSelected())
ACTUAL:
*/
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Contains("exit status 1")).Confirm()
t.Views().Commits().IsFocused().Lines(Contains("JS").IsSelected())
},
})