Add function: git_merge_file_from_index #1062
Open
Conversation
This file contains 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
Nov 2, 2024
libgit2-sys/lib.rs
Outdated
Comment on lines
1373
to
1377
| impl Clone for git_merge_file_result { | ||
| fn clone(&self) -> git_merge_file_result { | ||
| *self | ||
| } | ||
| } |
There was a problem hiding this comment.
Can you say why this is manually implemented instead of being derive?
src/repo.rs
Outdated
| opts: Option<&mut MergeFileOptions>, | ||
| ) -> Result<MergeFileResult<'_>, Error> { | ||
| let create_raw_entry = |entry: &IndexEntry| -> Result<raw::git_index_entry, Error> { | ||
| let path = CString::new(&entry.path[..])?; |
There was a problem hiding this comment.
This does not look correct to me because the CString is freed at the end of the closure, and thus the pointer in the git_index_entry is dangling.
Also, would it be possible to factor this code in some way (either a function or macro) to avoid duplicating it? And preferably in a way that would safely manage the allocation here.
src/repo.rs
Outdated
Comment on lines
2559
to
2565
| let mut ret = raw::git_merge_file_result { | ||
| automergeable: 0, | ||
| path: ptr::null_mut(), | ||
| mode: 0, | ||
| ptr: ptr::null_mut(), | ||
| len: 0, | ||
| }; |
There was a problem hiding this comment.
I think it's fine to just use a zeroed struct (at least that's what libgit2 seems to do).
Suggested change
| let mut ret = raw::git_merge_file_result { | |
| automergeable: 0, | |
| path: ptr::null_mut(), | |
| mode: 0, | |
| ptr: ptr::null_mut(), | |
| len: 0, | |
| }; | |
| let mut ret = unsafe { mem::zeroed() }; |
src/merge.rs
Outdated
| } | ||
| } | ||
|
|
||
| impl<'repo> std::fmt::Display for MergeFileResult<'repo> { |
There was a problem hiding this comment.
Can this impl Debug instead of Display?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.