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 stash apply & pop support #501

Merged
merged 4 commits into from
Sep 8, 2015
Merged

Add stash apply & pop support #501

merged 4 commits into from
Sep 8, 2015

Conversation

tiennou
Copy link
Contributor

@tiennou tiennou commented Aug 9, 2015

Sorry, there's no test in there because I wasn't running the greatest and latest Xcode when I wrote that, and time is pretty scarce yadda yadda.

@joshaber
Copy link
Member

Those build failures look legit. Looks like the PR was written against a different version of libgit2.

@tiennou
Copy link
Contributor Author

tiennou commented Aug 10, 2015

Oh my fault, I failed to build the correct target before pushing, and the stash API now has a "nice" git_stash_options struct. I'll update the API and try to write some of those tests then...

@joshaber
Copy link
Member

joshaber commented Sep 8, 2015

Sorry, I totally missed that this was ready for re-review.

It looks good to me. 👍 Just wanna confirm that this is done from your point of view too.

@tiennou
Copy link
Contributor Author

tiennou commented Sep 8, 2015

My only grudge against it is that it's untested (like, I didn't actually use it, just wrote the wrappers). I might add test cases soon-ish, but if you want to merge, please do.

@joshaber
Copy link
Member

joshaber commented Sep 8, 2015

Oh lol I totally didn't notice that. Tests would be good 👍

@tiennou
Copy link
Contributor Author

tiennou commented Sep 8, 2015

Here are some tests. I also made a little tweak to the signatures because I noticed those pesky error pointers weren't at the "right" place...

Note that this is not designed to handle conflicts at the moment, since git_stash_options embeds a git_checkout_options structure, this would make a messy parameter list. Related to #459. So the path forward here is either that other PR, or providing

- applyStashAtIndex:flags:checkoutStrategy:checkoutNotify:error:stashProgressBlock:checkoutProgressBlock:checkoutNotifyBlock:

😟

@joshaber
Copy link
Member

joshaber commented Sep 8, 2015

Ugh yeah, I think that PR is our best way forward on that front.

This looks good 🤘

joshaber added a commit that referenced this pull request Sep 8, 2015
Add stash apply & pop support
@joshaber joshaber merged commit 6e5a9d9 into master Sep 8, 2015
@joshaber joshaber deleted the stash_apply branch September 8, 2015 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants