Add function: merge_file #1210
Open
Add function: merge_file #1210
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ehuss
reviewed
Feb 1, 2026
libgit2-sys/lib.rs
Outdated
| their_tree: *const git_tree, | ||
| opts: *const git_merge_options, | ||
| ) -> c_int; | ||
| pub fn git_merge_file_init_input(opts: *mut git_merge_file_input, version: c_uint) -> c_int; |
Contributor
There was a problem hiding this comment.
This function appears to be deprecated. Should it use git_merge_file_input_init instead?
libgit2-sys/lib.rs
Outdated
| } | ||
|
|
||
| #[repr(C)] | ||
| #[derive(Copy, Clone)] |
Contributor
There was a problem hiding this comment.
When is it valid to copy/clone this structure? It seems like if it contains pointers, that should not be allowed.
src/merge.rs
Outdated
| @@ -1,3 +1,4 @@ | |||
| use libc::{c_char, size_t}; | |||
Contributor
There was a problem hiding this comment.
Can you combine this with the other libc import?
src/merge.rs
Outdated
Comment on lines
11
to
12
| use crate::Error; | ||
| use crate::FileMode; |
Contributor
There was a problem hiding this comment.
Can you merge all these top-level crate imports (including IntoCString) into the braced import below?
Author
|
Thanks for the review — the changes are now updated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some overlap with #635 but that PR has been open for years.