diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/git/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/git/mod.rs b/src/lib/git/mod.rs index c5b5f2e..f9ce043 100644 --- a/src/lib/git/mod.rs +++ b/src/lib/git/mod.rs | |||
| @@ -740,7 +740,7 @@ impl RepoActions for Repo { | |||
| 740 | .git_repo | 740 | .git_repo |
| 741 | .commit_signed( | 741 | .commit_signed( |
| 742 | commit_buff.as_str().unwrap(), | 742 | commit_buff.as_str().unwrap(), |
| 743 | pgp_sig.unwrap_or(String::new()).as_str(), | 743 | pgp_sig.as_deref().unwrap_or(""), |
| 744 | None, | 744 | None, |
| 745 | ) | 745 | ) |
| 746 | .context("failed to create signed commit")?; | 746 | .context("failed to create signed commit")?; |
| @@ -773,7 +773,7 @@ impl RepoActions for Repo { | |||
| 773 | ) | 773 | ) |
| 774 | .context("failed to amend commit to produce new oid")?; | 774 | .context("failed to amend commit to produce new oid")?; |
| 775 | } | 775 | } |
| 776 | if !applied_oid.to_string().eq(commit_id) { | 776 | if !applied_oid.to_string().eq(commit_id) && pgp_sig.is_none() { |
| 777 | bail!( | 777 | bail!( |
| 778 | "when applied the patch commit id ({}) doesn't match the one specified in the event tag ({})", | 778 | "when applied the patch commit id ({}) doesn't match the one specified in the event tag ({})", |
| 779 | applied_oid, | 779 | applied_oid, |