forked from Lainports/freebsd-ports
deaa22d85c
- Force rebuild all consumers to catch regressions early Thanks to Mikaël Urankar for providing updated bootstraps for aarch64, armv6, armv7, powerpc64. Changes: https://blog.rust-lang.org/2019/09/26/Rust-1.38.0.html Tested by: jbeich, mikael.urankar@gmail.com, tobik With hat: rust Differential Revision: https://reviews.freebsd.org/D21778
30 lines
1.1 KiB
Rust
30 lines
1.1 KiB
Rust
Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458
|
|
|
|
--- vendor/libgit2-sys/lib.rs.orig 2019-08-16 20:27:18 UTC
|
|
+++ vendor/libgit2-sys/lib.rs
|
|
@@ -331,7 +331,6 @@ pub struct git_remote_callbacks {
|
|
pub push_negotiation: Option<git_push_negotiation>,
|
|
pub transport: Option<git_transport_cb>,
|
|
pub payload: *mut c_void,
|
|
- pub resolve_url: Option<git_url_resolve_cb>,
|
|
}
|
|
|
|
#[repr(C)]
|
|
@@ -385,8 +384,6 @@ pub type git_push_negotiation =
|
|
|
|
pub type git_push_update_reference_cb =
|
|
extern "C" fn(*const c_char, *const c_char, *mut c_void) -> c_int;
|
|
-pub type git_url_resolve_cb =
|
|
- extern "C" fn(*mut git_buf, *const c_char, c_int, *mut c_void) -> c_int;
|
|
|
|
#[repr(C)]
|
|
pub struct git_push_update {
|
|
@@ -2233,7 +2230,7 @@ extern "C" {
|
|
source: *const git_tree,
|
|
) -> c_int;
|
|
pub fn git_treebuilder_clear(bld: *mut git_treebuilder);
|
|
- pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> size_t;
|
|
+ pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> c_uint;
|
|
pub fn git_treebuilder_free(bld: *mut git_treebuilder);
|
|
pub fn git_treebuilder_get(
|
|
bld: *mut git_treebuilder,
|