diff options
| author | Tyler Ang-Wanek <tylerw@axosoft.com> | 2019-07-02 09:48:08 -0700 |
|---|---|---|
| committer | Tyler Ang-Wanek <tylerw@axosoft.com> | 2019-07-02 09:51:17 -0700 |
| commit | 3b8a6f43974e23a554d852e09fb3a0d94accf6dc (patch) | |
| tree | 62855f65e8b4e97f9e2a20919fb95cc10c547a25 | |
| parent | b14cc27915a1105df2dd780224518863048a34ad (diff) | |
| download | libgit2-3b8a6f43974e23a554d852e09fb3a0d94accf6dc.tar.gz | |
fixup: Leverage git_error_set_after_callback_function
| -rw-r--r-- | src/rebase.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/rebase.c b/src/rebase.c index 6aef85913..802be75fa 100644 --- a/src/rebase.c +++ b/src/rebase.c @@ -987,13 +987,13 @@ static int rebase_commit__create( goto done; git_error_clear(); - if ((error = rebase->options.signing_cb(&commit_signature, &signature_field, - git_buf_cstr(&commit_content), rebase->options.payload)) < 0 && - error != GIT_PASSTHROUGH) { - if (git_error_last() == NULL) - git_error_set(GIT_ERROR_CALLBACK, "commit signing_cb failed"); - goto done; - } + error = git_error_set_after_callback_function(rebase->options.signing_cb( + &commit_signature, &signature_field, git_buf_cstr(&commit_content), + rebase->options.payload), "commit signing_cb failed"); + if (error == GIT_PASSTHROUGH) + git_error_clear(); + else if (error < 0) + goto done; if (error != GIT_PASSTHROUGH) { if (git_buf_is_allocated(&signature_field)) { |