Skip to content

Bump libgit2 submodule to 1.2.0 #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libgit2-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "libgit2-sys"
version = "0.12.22+1.1.0"
version = "0.12.22+1.2.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the version needs to be bumped to 23 there since otherwise cargo ignores the metadata.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh ooops I forgot I left this PR here. I didn't see anything too too serious in terms of security in the release notes so I wasn't planning on releasing this immediately. I just wanted to bump this to make sure that in the future when the crate version is bumped the build metadata is still accurate.

authors = ["Josh Triplett <[email protected]>", "Alex Crichton <[email protected]>"]
links = "git2"
build = "build.rs"
Expand Down
20 changes: 20 additions & 0 deletions libgit2-sys/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<extern "C" fn(*mut git_remote, c_int, *mut c_void) -> c_int>;

#[repr(C)]
pub struct git_remote_callbacks {
pub version: c_uint,
Expand All @@ -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,
}
Expand Down Expand Up @@ -1486,6 +1489,8 @@ pub struct git_odb_backend {
) -> c_int,
>,

pub writemidx: Option<extern "C" fn(*mut git_odb_backend) -> c_int>,

pub freshen: Option<extern "C" fn(*mut git_odb_backend, *const git_oid) -> c_int>,

pub free: Option<extern "C" fn(*mut git_odb_backend)>,
Expand Down Expand Up @@ -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)]
Expand All @@ -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,
}
Expand Down
2 changes: 1 addition & 1 deletion libgit2-sys/libgit2
Submodule libgit2 updated 233 files