Skip to content
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

Add checkout strategy to stash apply/pop methods #606

Merged
merged 3 commits into from
Feb 27, 2017

Conversation

slavikus
Copy link
Contributor

For a finer control over the unstash process, propogate checkout strategy to Objective-Git from the underlying libgit2 stash methods by adding an extra strategy argument to -[GTRepository applyStashAtIndex:…] and -[GTRepository popStashAtIndex:…]

For a finer control over the unstash process, propogate checkout strategy to Objective-Git from the underlying libgit2 stash methods.
@slavikus
Copy link
Contributor Author

@tiennou , I'm going to flood you with these one by one now :D

@pietbrauer
Copy link
Member

@slavikus Could you rebase this branch onto master with #459 being merged?

@slavikus
Copy link
Contributor Author

@pietbrauer will do.

# Conflicts:
#	ObjectiveGit/GTRepository+Stashing.m
@slavikus
Copy link
Contributor Author

@pietbrauer there we go.

@pietbrauer
Copy link
Member

@slavikus So it's basically adding (with a default checkout strategy) and two new lines or did something go wrong in the merging?

@slavikus
Copy link
Contributor Author

@pietbrauer In this PR, I've added checkout strategy as a separate parameter; in #459 , it was replaced by more generic (and more broad) GTCheckoutOptions class, so I've removed the more shallow variant that was previously used here.

@pietbrauer
Copy link
Member

Ok, so something went wrong. There are only 4 changed lines

@slavikus
Copy link
Contributor Author

Nah, not really. #459 basically superceeded this one entirely. :)

@slavikus
Copy link
Contributor Author

However, now when I think of it, the "(with a default checkout strategy)" makes no sense anymore. :) I'll push a clarifying commit.

@pietbrauer
Copy link
Member

Ok, cool. Thanks. No need to wait for CI then.

@pietbrauer pietbrauer merged commit d59731d into libgit2:master Feb 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants