fixup: Leverage git_error_set_after_callback_function

3b8a6f43 · Tyler Ang-Wanek · b14cc279 · 3b8a6f43
Unverified Commit 3b8a6f43 authored Jul 02, 2019 by Tyler Ang-Wanek
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

src/rebase.c
+7 -7

No files found.
--- 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,
+    error = git_error_set_after_callback_function(rebase->options.signing_cb(
-				git_buf_cstr(&commit_content), rebase->options.payload)) < 0 &&
+      &commit_signature, &signature_field, git_buf_cstr(&commit_content),
-				error != GIT_PASSTHROUGH) {
+      rebase->options.payload), "commit signing_cb failed");
-			if (git_error_last() == NULL)
+    if (error == GIT_PASSTHROUGH)
-				git_error_set(GIT_ERROR_CALLBACK, "commit signing_cb failed");
+      git_error_clear();
-			goto done;
+    else if (error < 0)
-		}
+      goto done;
 		if (error != GIT_PASSTHROUGH) {
 			if (git_buf_is_allocated(&signature_field)) {