Make the apply/pop machinery common

Author: tiennou

ObjectiveGit/GTRepository+Stashing.m

@@ -59,7 +59,7 @@ static int stashApplyProgressCallback(git_stash_apply_progress_t progress, void
 	return (stop ? GIT_EUSER : 0);
 }
 
-- (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock {
+- (BOOL)applyStashAtIndex:(NSUInteger)index popStash:(BOOL)pop flags:(GTRepositoryStashApplyFlag)flags error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress, BOOL * __nonnull))progressBlock {
 	git_stash_apply_options stash_options = GIT_STASH_APPLY_OPTIONS_INIT;
 
 	stash_options.flags = (git_stash_apply_flags)flags;
@@ -68,29 +68,28 @@ - (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)fl
 		stash_options.progress_payload = (__bridge void *)progressBlock;
 	}
 
-	int gitError = git_stash_apply(self.git_repository, index, &stash_options);
-	if (gitError != GIT_OK) {
-		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Stash apply failed" failureReason:@"The stash at index %ld couldn't be applied.", (unsigned long)index];
-		return NO;
+	if (pop == NO) {
+		int gitError = git_stash_apply(self.git_repository, index, &stash_options);
+		if (gitError != GIT_OK) {
+			if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Stash apply failed" failureReason:@"The stash at index %ld couldn't be applied.", (unsigned long)index];
+			return NO;
+		}
+	} else {
+		int gitError = git_stash_pop(self.git_repository, index, &stash_options);
+		if (gitError != GIT_OK) {
+			if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Stash pop failed" failureReason:@"The stash at index %ld couldn't be applied.", (unsigned long)index];
+			return NO;
+		}
 	}
 	return YES;
 }
 
-- (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock {
-	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;
-	}
+- (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock {
+	return [self applyStashAtIndex:index popStash:NO flags:flags error:error progressBlock:progressBlock];
+}
 
-	int gitError = git_stash_pop(self.git_repository, index, &stash_options);
-	if (gitError != GIT_OK) {
-		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Stash pop failed" failureReason:@"The stash at index %ld couldn't be applied.", (unsigned long)index];
-		return NO;
-	}
-	return YES;
+- (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock {
+	return [self applyStashAtIndex:index popStash:YES flags:flags error:error progressBlock:progressBlock];
 }
 
 - (BOOL)dropStashAtIndex:(NSUInteger)index error:(NSError **)error {