diff options
Diffstat (limited to 'src/policies.rs')
| -rw-r--r-- | src/policies.rs | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/src/policies.rs b/src/policies.rs index 5eed65f..cc2b71e 100644 --- a/src/policies.rs +++ b/src/policies.rs @@ -70,37 +70,35 @@ pub fn verify_git_commits<G: Git, P: Gpg>( )?; if config.verify_email_addresses { - policy_result = policy_result.and(verify_email_addresses( - &config.author_domain, - &config.committer_domain, - ¬_manually_verified_commits, - )); + policy_result = policy_result.and_then(|| { + Ok(verify_email_addresses( + &config.author_domain, + &config.committer_domain, + ¬_manually_verified_commits, + )) + })?; } - if config.verify_commit_signatures { - policy_result = policy_result.and(verify_commit_signatures::<G, P>( - git, - &gpg, - ¬_manually_verified_commits, - &mut keyring, - )?); + if config.verify_rebased { + policy_result = policy_result.and_then(|| { + verify_rebased::<G>(&all_commits, git, &ref_update, &config.override_tag_pattern) + })?; } if config.verify_different_authors { - policy_result = policy_result.and(verify_different_authors::<G>( - &all_commits, - git, - &ref_update, - )?); + policy_result = policy_result + .and_then(|| verify_different_authors::<G>(&all_commits, git, &ref_update))?; } - if config.verify_rebased { - policy_result = policy_result.and(verify_rebased::<G>( - &all_commits, - git, - &ref_update, - &config.override_tag_pattern, - )?); + if config.verify_commit_signatures { + policy_result = policy_result.and_then(|| { + verify_commit_signatures::<G, P>( + git, + &gpg, + ¬_manually_verified_commits, + &mut keyring, + ) + })?; } } |