summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorVicent Martí <vicent@github.com>2012-08-24 16:29:01 -0700
committerVicent Martí <vicent@github.com>2012-08-24 16:29:01 -0700
commitb7e8827b8bbca0c69d85be34cc4a88888c1152f2 (patch)
treef55dad3e7af50329b1a00a943035d1ebf4cb0def /include
parent09fad5069636fb2e8cacf15817834e3d32ff6b8e (diff)
parent0a1db746fbcaf09681e446250f75581cc8f8fd05 (diff)
downloadlibgit2-b7e8827b8bbca0c69d85be34cc4a88888c1152f2.tar.gz
Merge pull request #895 from carlosmn/sideband
Add sideband support
Diffstat (limited to 'include')
-rw-r--r--include/git2/indexer.h2
-rw-r--r--include/git2/remote.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/git2/indexer.h b/include/git2/indexer.h
index d300ba01..92d1d9e3 100644
--- a/include/git2/indexer.h
+++ b/include/git2/indexer.h
@@ -19,6 +19,8 @@ GIT_BEGIN_DECL
typedef struct git_indexer_stats {
unsigned int total;
unsigned int processed;
+ unsigned int received;
+ unsigned int data_received;
} git_indexer_stats;
diff --git a/include/git2/remote.h b/include/git2/remote.h
index 96f460e9..a3913af5 100644
--- a/include/git2/remote.h
+++ b/include/git2/remote.h
@@ -287,7 +287,7 @@ typedef enum git_remote_completion_type {
* Set the calbacks to be called by the remote.
*/
struct git_remote_callbacks {
- int (*progress)(const char *str, void *data);
+ void (*progress)(const char *str, int len, void *data);
int (*completion)(git_remote_completion_type type, void *data);
int (*update_tips)(const char *refname, const git_oid *a, const git_oid *b, void *data);
void *data;