objective-git (original) (raw)

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 andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation10 Commits3 Checks0 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

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.

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

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

Conflicts:

ObjectiveGit/GTRepository+Stashing.m

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

@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.

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.

2 participants