Skip to content

Fix two defects left by the libgit2 1.x API migration #107

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
hannesa2 merged 2 commits into from
Sep 21, 2026
+4 −4
Merged

Fix two defects left by the libgit2 1.x API migration #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
312c2f2
Fix the merge file input being initialized as merge options
goneng Sep 20, 2026
1e142e0
Fix GTCredential declaring an accessor that does not exist
goneng Sep 20, 2026
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
6 changes: 3 additions & 3 deletions ObjectiveGit/GTCredential.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ - (GTCredential *)credentialForType:(GTCredentialType)type URL:(NSString *)URL u
@end

@interface GTCredential ()
@property (nonatomic, assign, readonly) git_credential *git_cred;
@property (nonatomic, assign, readonly) git_credential *git_credential;
@end

@implementation GTCredential
Expand Down Expand Up @@ -91,7 +91,7 @@ - (instancetype)initWithGitCred:(git_credential *)cred {

if (self == nil) return nil;

_git_cred = cred;
_git_credential = cred;

return self;
}
Expand Down Expand Up @@ -119,6 +119,6 @@ int GTCredentialAcquireCallback(git_credential **cred, const char *url, const ch
return GIT_ERROR;
}

*cred = gtCred.git_cred;
*cred = gtCred.git_credential;
return GIT_OK;
}
2 changes: 1 addition & 1 deletion ObjectiveGit/GTRepository+Merging.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ - (NSString * _Nullable)contentsOfDiffWithAncestor:(GTIndexEntry *)ancestor ourS

// initialize our merge file input
git_merge_file_input ourInput;
gitError = git_merge_file_options_init(&ourInput, GIT_MERGE_FILE_INPUT_VERSION);
gitError = git_merge_file_input_init(&ourInput, GIT_MERGE_FILE_INPUT_VERSION);
if (gitError != GIT_OK) {
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to create merge file input for our side"];
return nil;
Expand Down
Loading