Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6675 from libgit2/ethomson/push_cancel

Browse Source 
push: set generic error in push_negotiation cb
This commit is contained in:
Edward Thomson
2023-12-14 12:21:05 +00:00
committed by GitHub
parent ac23866768 8b7495fc82
commit 2dbc810a54
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libgit2/push.c
View File

@@ -444,10 +444,21 @@ static int do_push(git_push *push)
if ((error = calculate_work(push)) < 0)
goto on_error;
if (callbacks && callbacks->push_negotiation &&
(error = callbacks->push_negotiation((const git_push_update **) push->updates.contents,
push->updates.length, callbacks->payload)) < 0)
goto on_error;
if (callbacks && callbacks->push_negotiation) {
git_error_clear();
error = callbacks->push_negotiation(
(const git_push_update **) push->updates.contents,
push->updates.length, callbacks->payload);
if (error < 0) {
git_error_set_after_callback_function(error,
"push_negotiation");
goto on_error;
}
error = 0;
}
if ((error = queue_objects(push)) < 0 ||
(error = transport->push(transport, push)) < 0)