Fix untracked files problem in multiple commits rebases with conflicts#990
Merged
Merged
Conversation
...to fix issue where untracked files are left behind after forceCheckoutHEAD is called during a rebase
Collaborator
|
Thank you again @lapfelix. Apologies on the slow turnaround for this. |
Contributor
Author
|
Oh no worries! I've been using a version of GitUp with this change (and what's in my other PR too) for work for months now and it seems good to me. |
|
Unbelievable! Thank you so much! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #882
Added and implement
kGCCheckoutOption_RemoveUntrackedFilesto fix issue where untracked files are left behind after forceCheckoutHEAD is called during a rebase.I was able to reproduce the issue in the
-[GCEmptyLiveRepositoryTestCase testMultipleCommitsRebaseWithConflict]test I implemented in #989 (I would've based this branch on the branch I used for PR 989 but I can't open a PR on another PR from my fork).Then I dug deeper and deeper until I found that
-[GCRepository forceCheckoutHEAD:error:]didn't remove untracked files, but that this was required for rebases. I still don't fully understand what caused this regression, but this does seem to fix it (and all the other tests pass).I AGREE TO THE GITUP CONTRIBUTOR LICENSE AGREEMENT