Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-23 08:58:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

too many things skipped with !verify

Browse source
This commit is contained in:
pm100 2023-05-21 18:01:33 +02:00 committed by extrawurst
parent cdaf3b8b84
commit 2b3bc622d6
1 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/components/commit.rs
View file

@ -239,31 +239,35 @@ impl CommitComponent {
&mut self,
msg: String,
) -> Result<CommitResult> {
if !self.verify {
self.do_commit(&msg)?;
self.verify = true;
return Ok(CommitResult::ComitDone);
}
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);
// on exit verify should always be on
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 = message_prettify(msg, Some(b'#'))?;
if let HookResult::NotOk(e) =
sync::hooks_commit_msg(&self.repo.borrow(), &mut msg)?
{
log::error!("commit-msg hook error: {}", e);
self.queue.push(InternalEvent::ShowErrorMsg(format!(
"commit-msg hook error:\n{e}"
)));
return Ok(CommitResult::Aborted);
if verify {
// run commit message check hook - can reject commit
if let HookResult::NotOk(e) =
sync::hooks_commit_msg(&self.repo.borrow(), &mut msg)?
{
log::error!("commit-msg hook error: {}", e);
self.queue.push(InternalEvent::ShowErrorMsg(
format!("commit-msg hook error:\n{e}"),
));
return Ok(CommitResult::Aborted);
}
}
self.do_commit(&msg)?;
if let HookResult::NotOk(e) =