From af835b6cecd64411e3837121493d18d20b51e4be Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 2 Sep 2021 07:07:29 -0700 Subject: [PATCH 1/2] Bump libgit2 submodule to 1.2.0 Follow the recent release of 1.2.0 --- libgit2-sys/Cargo.toml | 2 +- libgit2-sys/libgit2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml index ed4299a36c..94e3f54994 100644 --- a/libgit2-sys/Cargo.toml +++ b/libgit2-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libgit2-sys" -version = "0.12.22+1.1.0" +version = "0.12.22+1.2.0" authors = ["Josh Triplett ", "Alex Crichton "] links = "git2" build = "build.rs" diff --git a/libgit2-sys/libgit2 b/libgit2-sys/libgit2 index be95f684da..4fd32be01c 160000 --- a/libgit2-sys/libgit2 +++ b/libgit2-sys/libgit2 @@ -1 +1 @@ -Subproject commit be95f684da5d05e59919448c1061febbd4ff6eb8 +Subproject commit 4fd32be01c79a5c003bb47674ac1d76d948518b7 From ce37a32383c83041d3b8efc054fc36c33d632908 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 2 Sep 2021 07:15:41 -0700 Subject: [PATCH 2/2] Update bindings --- libgit2-sys/lib.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libgit2-sys/lib.rs b/libgit2-sys/lib.rs index 4e2f9be0f9..d6f6356b6f 100644 --- a/libgit2-sys/lib.rs +++ b/libgit2-sys/lib.rs @@ -353,6 +353,8 @@ pub type git_indexer_progress_cb = )] pub type git_transfer_progress = git_indexer_progress; +pub type git_remote_ready_cb = Option c_int>; + #[repr(C)] pub struct git_remote_callbacks { pub version: c_uint, @@ -368,6 +370,7 @@ pub struct git_remote_callbacks { pub push_update_reference: git_push_update_reference_cb, pub push_negotiation: git_push_negotiation, pub transport: git_transport_cb, + pub remote_ready: git_remote_ready_cb, pub payload: *mut c_void, pub resolve_url: git_url_resolve_cb, } @@ -1486,6 +1489,8 @@ pub struct git_odb_backend { ) -> c_int, >, + pub writemidx: Option c_int>, + pub freshen: Option c_int>, pub free: Option, @@ -1745,6 +1750,20 @@ pub type git_commit_signing_cb = Option< ) -> c_int, >; +pub type git_commit_create_cb = Option< + extern "C" fn( + *mut git_oid, + *const git_signature, + *const git_signature, + *const c_char, + *const c_char, + *const git_tree, + usize, + *const git_commit, + *mut c_void, + ) -> c_int, +>; + pub const GIT_REBASE_NO_OPERATION: usize = usize::max_value(); #[repr(C)] @@ -1755,6 +1774,7 @@ pub struct git_rebase_options { pub rewrite_notes_ref: *const c_char, pub merge_options: git_merge_options, pub checkout_options: git_checkout_options, + pub commit_create_cb: git_commit_create_cb, pub signing_cb: git_commit_signing_cb, pub payload: *mut c_void, }