Skip to content

update submodule libgit2 to new commit to fix 'omits non-default port numbers' #421

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.

Sign up for GitHub

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 7 commits into from
May 23, 2019
Merged

update submodule libgit2 to new commit to fix 'omits non-default port numbers' #421

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3d823d3
update submodule libgit2 new commit to fix 'Host header omits non-def…
bhamail May 17, 2019
764877b
change constant GIT_DIFF_INDENT_HEURISTIC in lib.rs to match declarat…
bhamail May 21, 2019
d475dc9
attempt to fix seg fault in the `all` test. Thanks again @ehuss
bhamail May 21, 2019
2538388
reorder constant location to match sequential values of existing cons…
bhamail May 22, 2019
437e22e
add version to dev dependency
bhamail May 22, 2019
69334f8
move init call into `git2_curl::register`
bhamail May 22, 2019
4b4a1be
move libgit2_sys::init() call to transport::register()
bhamail May 23, 2019
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
1 change: 1 addition & 0 deletions git2-curl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ civet = "0.11"
conduit = "0.8"
conduit-git-http-backend = "0.8"
tempfile = "3.0"
libgit2-sys = { path = "../libgit2-sys"}
Copy link
Contributor

Choose a reason for hiding this comment

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

This won't publish without a version.

Copy link
Contributor Author

@bhamail bhamail May 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Done in 437e22e

For my own learning: I was guessing a version was not needed due to no version declared in this other case for 'systest':
https://github.com/rust-lang/git2-rs/blob/master/systest/Cargo.toml#L8

I guess there is no magic that inherits the version from the higher level https://github.com/rust-lang/git2-rs/blob/master/Cargo.toml#L26 ?


[[test]]
name = "all"
Expand Down
1 change: 1 addition & 0 deletions git2-curl/tests/all.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const PORT: u16 = 7848;

fn main() {
unsafe {
libgit2_sys::init();
Copy link
Member

Choose a reason for hiding this comment

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

This seems somewhat suspicious in the sense that git2_curl should internally not require this but instead do it on behalf of libraries. I think that there's perhaps a missing call to initialization somewhere inside of git2 itself, since git2_curl only uses the APIs of git2?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yea, I meant that init should be called from git2_curl::register, not with.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I moved the init call into git2_curl::register. 69334f8
Feels like I'm missing a way to get this init'd without adding a direct dependency on libgit2_sys, but I'm not seeing it. (noob alert).

git2_curl::register(curl::easy::Easy::new());
}

Expand Down
2 changes: 1 addition & 1 deletion libgit2-sys/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,7 +1112,7 @@ pub const GIT_DIFF_SHOW_UNMODIFIED: git_diff_option_t = 1 << 26;
pub const GIT_DIFF_PATIENCE: git_diff_option_t = 1 << 28;
pub const GIT_DIFF_MINIMAL: git_diff_option_t = 1 << 29;
pub const GIT_DIFF_SHOW_BINARY: git_diff_option_t = 1 << 30;
pub const GIT_DIFF_INDENT_HEURISTIC: git_diff_option_t = 1 << 31;
pub const GIT_DIFF_INDENT_HEURISTIC: git_diff_option_t = 1 << 18;
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you keep this numerically sorted with the others?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure thing. Done in 2538388


#[repr(C)]
pub struct git_diff_find_options {
Expand Down
2 changes: 1 addition & 1 deletion libgit2-sys/libgit2
Open in desktop
Submodule libgit2 updated 861 files