-
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
Add checkout strategy to stash apply/pop methods #606
Conversation
For a finer control over the unstash process, propogate checkout strategy to Objective-Git from the underlying libgit2 stash methods.
@tiennou , I'm going to flood you with these one by one now :D |
@pietbrauer will do. |
# Conflicts: # ObjectiveGit/GTRepository+Stashing.m
@pietbrauer there we go. |
@slavikus So it's basically adding |
@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. |
Ok, so something went wrong. There are only 4 changed lines |
Nah, not really. #459 basically superceeded this one entirely. :) |
However, now when I think of it, the "(with a default checkout strategy)" makes no sense anymore. :) I'll push a clarifying commit. |
Ok, cool. Thanks. No need to wait for CI then. |
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:…]