diff options
Diffstat (limited to 'src/transports/smart_protocol.c')
| -rw-r--r-- | src/transports/smart_protocol.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c index f023db4df..9e7b0a72b 100644 --- a/src/transports/smart_protocol.c +++ b/src/transports/smart_protocol.c @@ -950,6 +950,7 @@ int git_smart__push(git_transport *transport, git_push *push) { transport_smart *t = (transport_smart *)transport; struct push_packbuilder_payload packbuilder_payload = {0}; + git_remote_callbacks *cbs = &push->remote->callbacks; git_buf pktline = GIT_BUF_INIT; int error = 0, need_pack = 0; push_spec *spec; @@ -957,9 +958,9 @@ int git_smart__push(git_transport *transport, git_push *push) packbuilder_payload.pb = push->pb; - if (push->transfer_progress_cb) { - packbuilder_payload.cb = push->transfer_progress_cb; - packbuilder_payload.cb_payload = push->transfer_progress_cb_payload; + if (cbs->transfer_progress) { + packbuilder_payload.cb = cbs->push_transfer_progress; + packbuilder_payload.cb_payload = cbs->payload; } #ifdef PUSH_DEBUG @@ -1010,12 +1011,12 @@ int git_smart__push(git_transport *transport, git_push *push) goto done; /* If progress is being reported write the final report */ - if (push->transfer_progress_cb) { - error = push->transfer_progress_cb( + if (cbs->push_transfer_progress) { + error = cbs->push_transfer_progress( push->pb->nr_written, push->pb->nr_objects, packbuilder_payload.last_bytes, - push->transfer_progress_cb_payload); + cbs->payload); if (error < 0) goto done; |