-
Notifications
You must be signed in to change notification settings - Fork 280
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
Bump libgit2. #446
Bump libgit2. #446
Conversation
@@ -1 +1 @@ | |||
Subproject commit d5712ed2b33a18a4f9417d112bda7813c0570caa |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The full list of changes to libgit2.
👍 These changes seem reasonable. The test failures look legit, though. |
// fixme: This is a workaround for an issue where `git_filter_list_apply_to_file` | ||
// will not resolve relative paths against the worktree. It should be reverted when | ||
// libgit2 has been updated to resolve that. | ||
NSString *absolutePath = relativePath.absolutePath ? relativePath : [repository.fileURL URLByAppendingPathComponent:relativePath].path; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The relevant libgit2 issue is libgit2/libgit2#2960.
Many thanks to @ethomson for tracking down libgit2/libgit2#2960! |
|
||
return [NSString stringWithUTF8String:string]; | ||
NSString *string = [[NSString alloc] initWithBytes:buffer.ptr length:buffer.size encoding:NSUTF8StringEncoding]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we have an NSString
category for this. (If not, maybe we should.)
1️⃣ |
|
||
return [NSString stringWithUTF8String:string]; | ||
return [[NSString alloc] initWithData:[NSData git_dataWithBuffer:&buffer] encoding:NSUTF8StringEncoding]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Collapsed context. We have an NSData
method for this, but no NSString
one. I feel adding this to the NSString
category wouldn’t contribute any significant value, so I’ve just used the NSData
one.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👌
2️⃣ |
Bumps libgit2 to fix a crash enumerating status items (see below).
libgit2 has had some breaking API changes lately. I’ve followed these, and thus this PR also introduces breaking API changes.
Backtrace: