Skip to content

Add checkout strategy to stash apply/pop methods #606

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 3 commits into from
Feb 27, 2017
Merged

Add checkout strategy to stash apply/pop methods #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11e5bb2
Add checkout strategy to stash apply/pop methods
slavikus Dec 5, 2016
00a5bc4
Fix conflicts with pull request #459
slavikus Feb 27, 2017
daf7a6f
Correct descriptions of applyStash: and popStash:
slavikus Feb 27, 2017
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
4 changes: 2 additions & 2 deletions ObjectiveGit/GTRepository+Stashing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ NS_ASSUME_NONNULL_BEGIN
///
/// index - The index of the stash to apply. 0 is the latest one.
/// flags - The flags to use when applying the stash.
/// options - The options to use when checking out.
/// options - The options to use when checking out (if nil, use the defaults provided by libgit2).
/// error - If not NULL, set to any error that occurred.
/// progressBlock - A block that will be executed on each step of the stash application.
///
Expand All @@ -77,7 +77,7 @@ NS_ASSUME_NONNULL_BEGIN
///
/// index - The index of the stash to apply. 0 is the most recent stash.
/// flags - The flags to use when applying the stash.
/// options - The options to use when checking out.
/// options - The options to use when checking out (if nil, use the defaults provided by libgit2).
/// error - If not NULL, set to any error that occurred.
/// progressBlock - A block that will be executed on each step of the stash application.
///
Expand Down
2 changes: 2 additions & 0 deletions ObjectiveGit/GTRepository+Stashing.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ - (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)fl
git_stash_apply_options stash_options = GIT_STASH_APPLY_OPTIONS_INIT;

stash_options.flags = (git_stash_apply_flags)flags;

if (progressBlock != nil) {
stash_options.progress_cb = stashApplyProgressCallback;
stash_options.progress_payload = (__bridge void *)progressBlock;
Expand All @@ -84,6 +85,7 @@ - (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flag
git_stash_apply_options stash_options = GIT_STASH_APPLY_OPTIONS_INIT;

stash_options.flags = (git_stash_apply_flags)flags;

if (progressBlock != nil) {
stash_options.progress_cb = stashApplyProgressCallback;
stash_options.progress_payload = (__bridge void *)progressBlock;
Expand Down