From 99433ca66ab746ab1863e626eddf85ccab04c640 Mon Sep 17 00:00:00 2001 From: Matthew Duggan Date: Mon, 18 Aug 2014 21:12:34 +0900 Subject: [PATCH] Hard-code callback version because we'll need to change the defs if it changes. --- pygit2/decl.h | 1 - pygit2/remote.py | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pygit2/decl.h b/pygit2/decl.h index 0676b67..4e3df66 100644 --- a/pygit2/decl.h +++ b/pygit2/decl.h @@ -12,7 +12,6 @@ typedef ... git_index_conflict_iterator; #define GIT_OID_RAWSZ ... #define GIT_PATH_MAX ... -#define GIT_REMOTE_CALLBACKS_VERSION ... typedef struct git_oid { unsigned char id[20]; diff --git a/pygit2/remote.py b/pygit2/remote.py index dfeb4d7..e147fc5 100644 --- a/pygit2/remote.py +++ b/pygit2/remote.py @@ -191,11 +191,12 @@ class Remote(object): Perform a fetch against this remote. """ + # Get the default callbacks first defaultcallbacks = ffi.new('git_remote_callbacks *') - err = C.git_remote_init_callbacks(defaultcallbacks, - C.GIT_REMOTE_CALLBACKS_VERSION) + err = C.git_remote_init_callbacks(defaultcallbacks, 1) + check_error(err) - # Build the callback structure + # Build custom callback structure callbacks = ffi.new('git_remote_callbacks *') callbacks.version = 1 callbacks.sideband_progress = self._sideband_progress_cb