Skip to content

fix: run pre-commit hook before opening commit dialog #2909

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
ChihebBENCHEIKH1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: run pre-commit hook before opening commit dialog #2909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 19 additions & 13 deletions src/popups/commit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,19 +235,6 @@ impl CommitPopup {
let verify = self.verify;
self.verify = true;

if verify {
// run pre commit hook - can reject commit
if let HookResult::NotOk(e) =
sync::hooks_pre_commit(&self.repo.borrow())?
{
log::error!("pre-commit hook error: {e}");
self.queue.push(InternalEvent::ShowErrorMsg(
format!("pre-commit hook error:\n{e}"),
));
return Ok(CommitResult::Aborted);
}
}

let mut msg =
commit_message_prettify(&self.repo.borrow(), msg)?;

Expand Down Expand Up @@ -349,6 +336,21 @@ impl CommitPopup {
self.verify = !self.verify;
}

fn run_pre_commit_hook(&self) -> Result<bool> {
if self.verify {
if let HookResult::NotOk(e) =
sync::hooks_pre_commit(&self.repo.borrow())?
{
log::error!("pre-commit hook error: {e}");
self.queue.push(InternalEvent::ShowErrorMsg(
format!("pre-commit hook error:\n{e}"),
));
return Ok(false);
}
}
Ok(true)
}

pub fn open(&mut self, reword: Option<CommitId>) -> Result<()> {
//only clear text if it was not a normal commit dlg before, so to preserve old commit msg that was edited
if !matches!(self.mode, Mode::Normal) {
Expand Down Expand Up @@ -442,6 +444,10 @@ impl CommitPopup {

self.mode = mode;

if !self.run_pre_commit_hook()? {
return Ok(());
}

let mut msg = self.input.get_text().to_string();
if let HookResult::NotOk(e) = sync::hooks_prepare_commit_msg(
&self.repo.borrow(),
Expand Down