From d2bca2e67219b8950c512976348e7f30847ad382 Mon Sep 17 00:00:00 2001 From: Slava Karpenko Date: Mon, 5 Dec 2016 19:57:23 +0300 Subject: [PATCH 1/2] Fix typo in GTRepositoryStashApplyProgress MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GTRepositoryStashApplyProgressGheckoutUntracked -> GTRepositoryStashApplyProgressСheckoutUntracked --- ObjectiveGit/GTRepository+Stashing.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObjectiveGit/GTRepository+Stashing.h b/ObjectiveGit/GTRepository+Stashing.h index 31e73471a..97f3e6474 100644 --- a/ObjectiveGit/GTRepository+Stashing.h +++ b/ObjectiveGit/GTRepository+Stashing.h @@ -35,7 +35,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStashApplyProgress) { GTRepositoryStashApplyProgressAnalyzeIndex = GIT_STASH_APPLY_PROGRESS_ANALYZE_INDEX, GTRepositoryStashApplyProgressAnalyzeModified = GIT_STASH_APPLY_PROGRESS_ANALYZE_MODIFIED, GTRepositoryStashApplyProgressAnalyzeUntracked = GIT_STASH_APPLY_PROGRESS_ANALYZE_UNTRACKED, - GTRepositoryStashApplyProgressGheckoutUntracked = GIT_STASH_APPLY_PROGRESS_CHECKOUT_UNTRACKED, + GTRepositoryStashApplyProgressCheckoutUntracked = GIT_STASH_APPLY_PROGRESS_CHECKOUT_UNTRACKED, GTRepositoryStashApplyProgressCheckoutModified = GIT_STASH_APPLY_PROGRESS_CHECKOUT_MODIFIED, GTRepositoryStashApplyProgressDone = GIT_STASH_APPLY_PROGRESS_DONE, }; From d4a1818c208ad0be1d223dad5fae9546b4e15096 Mon Sep 17 00:00:00 2001 From: Slava Karpenko Date: Thu, 15 Dec 2016 16:22:43 +0300 Subject: [PATCH 2/2] Fix mergeBranchIntoCurrentBranch for conflicted state checkout_opts passed to libgit2 missed a GIT_CHECKOUT_SAFE strategy, causing a dry run and only conflicted files being written out to the tree (losing all other non-conflicted ones). --- ObjectiveGit/GTRepository+Merging.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObjectiveGit/GTRepository+Merging.m b/ObjectiveGit/GTRepository+Merging.m index aa4169e17..bb0c1fbb5 100644 --- a/ObjectiveGit/GTRepository+Merging.m +++ b/ObjectiveGit/GTRepository+Merging.m @@ -139,7 +139,7 @@ - (BOOL)mergeBranchIntoCurrentBranch:(GTBranch *)branch withError:(NSError **)er // Write conflicts git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT; git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; - checkout_opts.checkout_strategy = GIT_CHECKOUT_ALLOW_CONFLICTS; + checkout_opts.checkout_strategy = (GIT_CHECKOUT_SAFE | GIT_CHECKOUT_ALLOW_CONFLICTS); git_annotated_commit *annotatedCommit; [self annotatedCommit:&annotatedCommit fromCommit:remoteCommit error:error];