From 423b912fae0e17bd50b6989a354048b03a28a16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <cmn@dwim.me>
Date: Sun, 19 Jan 2014 01:29:03 +0100
Subject: [PATCH] Adjust to reference creation signatures

---
 src/branch.c     |  2 +-
 src/reference.c  |  6 +++---
 src/remote.c     |  4 ++--
 src/repository.c | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/branch.c b/src/branch.c
index bcf7636..32879f3 100644
--- a/src/branch.c
+++ b/src/branch.c
@@ -101,7 +101,7 @@ Branch_rename(Branch *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "s|i", &c_name, &force))
         return NULL;
 
-    err = git_branch_move(&c_out, self->reference, c_name, force);
+    err = git_branch_move(&c_out, self->reference, c_name, force, NULL, NULL);
     if (err == GIT_OK)
         return wrap_branch(c_out, self->repo);
     else
diff --git a/src/reference.c b/src/reference.c
index 1c78d41..2c5e0ff 100644
--- a/src/reference.c
+++ b/src/reference.c
@@ -159,7 +159,7 @@ Reference_rename(Reference *self, PyObject *py_name)
         return NULL;
 
     /* Rename */
-    err = git_reference_rename(&new_reference, self->reference, c_name, 0);
+    err = git_reference_rename(&new_reference, self->reference, c_name, 0, NULL, NULL);
     git_reference_free(self->reference);
     free(c_name);
     if (err < 0)
@@ -239,7 +239,7 @@ Reference_target__set__(Reference *self, PyObject *py_target)
         if (err < 0)
             return err;
 
-        err = git_reference_set_target(&new_ref, self->reference, &oid);
+        err = git_reference_set_target(&new_ref, self->reference, &oid, NULL, NULL);
         if (err < 0)
             goto error;
 
@@ -253,7 +253,7 @@ Reference_target__set__(Reference *self, PyObject *py_target)
     if (c_name == NULL)
         return -1;
 
-    err = git_reference_symbolic_set_target(&new_ref, self->reference, c_name);
+    err = git_reference_symbolic_set_target(&new_ref, self->reference, c_name, NULL, NULL);
     free(c_name);
     if (err < 0)
         goto error;
diff --git a/src/remote.c b/src/remote.c
index dee9b5a..deb832d 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -467,7 +467,7 @@ Remote_fetch(Remote *self, PyObject *args)
     int err;
 
     PyErr_Clear();
-    err = git_remote_fetch(self->remote);
+    err = git_remote_fetch(self->remote, NULL, NULL);
     /*
      * XXX: We should be checking for GIT_EUSER, but on v0.20, this does not
      * make it all the way to us for update_tips
@@ -558,7 +558,7 @@ Remote_push(Remote *self, PyObject *args)
         return NULL;
     }
 
-    err = git_push_update_tips(push);
+    err = git_push_update_tips(push, NULL, NULL);
     if (err < 0)
         goto error;
 
diff --git a/src/repository.c b/src/repository.c
index bb2a11b..738627f 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -192,7 +192,7 @@ Repository_head__set__(Repository *self, PyObject *py_refname)
     if (refname == NULL)
         return -1;
 
-    err = git_repository_set_head(self->repo, refname);
+    err = git_repository_set_head(self->repo, refname, NULL, NULL);
     Py_DECREF(trefname);
     if (err < 0) {
         Error_set_str(err, refname);
@@ -929,7 +929,7 @@ Repository_create_branch(Repository *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "sO!|i", &c_name, &CommitType, &py_commit, &force))
         return NULL;
 
-    err = git_branch_create(&c_reference, self->repo, c_name, py_commit->commit, force);
+    err = git_branch_create(&c_reference, self->repo, c_name, py_commit->commit, force, NULL, NULL);
     if (err < 0)
         return Error_set(err);
 
@@ -1096,7 +1096,7 @@ Repository_create_reference_direct(Repository *self,  PyObject *args,
     if (err < 0)
         return NULL;
 
-    err = git_reference_create(&c_reference, self->repo, c_name, &oid, force);
+    err = git_reference_create(&c_reference, self->repo, c_name, &oid, force, NULL, NULL);
     if (err < 0)
         return Error_set(err);
 
@@ -1130,7 +1130,7 @@ Repository_create_reference_symbolic(Repository *self,  PyObject *args,
         return NULL;
 
     err = git_reference_symbolic_create(&c_reference, self->repo, c_name,
-                                        c_target, force);
+                                        c_target, force, NULL, NULL);
     if (err < 0)
         return Error_set(err);
 
@@ -1607,7 +1607,7 @@ Repository_reset(Repository *self, PyObject* args)
 
     err = git_object_lookup_prefix(&target, self->repo, &oid, len,
                                    GIT_OBJ_ANY);
-    err = err < 0 ? err : git_reset(self->repo, target, reset_type);
+    err = err < 0 ? err : git_reset(self->repo, target, reset_type, NULL, NULL);
     git_object_free(target);
     if (err < 0)
         return Error_set_oid(err, &oid, len);