Skip to content

Bump libgit2 #466

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 9 commits into from
Jun 23, 2015
Merged

Bump libgit2 #466

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8e44dfd
++libgit2
joshaber Jun 22, 2015
4496405
API changes.
joshaber Jun 22, 2015
3820877
:cry:
joshaber Jun 22, 2015
9ad1a94
Update fetch and push with new API for callbacks
phatblat Jun 22, 2015
04835f7
Update clone with new API for callbacks
phatblat Jun 23, 2015
af1cdca
Fix clone progress & simplify fetch options init
phatblat Jun 23, 2015
dbe237a
Fix remote tests by reloading config
phatblat Jun 23, 2015
5139775
Add comment about broken test
phatblat Jun 23, 2015
b48d617
Remove broken test comment
phatblat Jun 23, 2015
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
Prev Previous commit
Next Next commit
Update clone with new API for callbacks
  • Loading branch information
@phatblat
phatblat committed Jun 23, 2015
commit 04835f7761d3786e73cad11bcd2a069bdac048df
17 changes: 7 additions & 10 deletions ObjectiveGit/GTRepository.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,6 @@ static void checkoutProgressCallback(const char *path, size_t completedSteps, si
block(nsPath, completedSteps, totalSteps);
}

#if 0

static int transferProgressCallback(const git_transfer_progress *progress, void *payload) {
if (payload == NULL) return 0;
struct GTClonePayload *pld = payload;
Expand All @@ -220,10 +218,8 @@ static int remoteCreate(git_remote **remote, git_repository *repo, const char *n
return GIT_OK;
}

#endif

+ (instancetype)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(NSDictionary *)options error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *, BOOL *stop))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock {
#if 0

git_clone_options cloneOptions = GIT_CLONE_OPTIONS_INIT;

NSNumber *bare = options[GTRepositoryCloneOptionsBare];
Expand All @@ -245,16 +241,18 @@ + (instancetype)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)work
.credProvider = {provider},
};

cloneOptions.remote_callbacks.version = GIT_REMOTE_CALLBACKS_VERSION;
git_fetch_options fetchOptions = GIT_FETCH_OPTIONS_INIT;

fetchOptions.callbacks.version = GIT_REMOTE_CALLBACKS_VERSION;

if (provider) {
cloneOptions.remote_callbacks.credentials = GTCredentialAcquireCallback;
fetchOptions.callbacks.credentials = GTCredentialAcquireCallback;
}

payload.transferProgressBlock = transferProgressBlock;

cloneOptions.remote_callbacks.transfer_progress = transferProgressCallback;
cloneOptions.remote_callbacks.payload = &payload;
fetchOptions.callbacks.transfer_progress = transferProgressCallback;
fetchOptions.callbacks.payload = &payload;

cloneOptions.remote_cb = remoteCreate;

Expand Down Expand Up @@ -288,7 +286,6 @@ + (instancetype)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)work
}

return [[self alloc] initWithGitRepository:repository];
#endif

return nil;
}
Expand Down