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

Fix untracked files problem in multiple commits rebases with conflicts #990

Merged
merged 1 commit into from
Jun 29, 2024

Conversation

lapfelix
Copy link
Contributor

@lapfelix lapfelix commented Apr 16, 2024

Fixes #882

Added and implement kGCCheckoutOption_RemoveUntrackedFiles to 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

...to fix issue where untracked files are left behind after forceCheckoutHEAD is called during a rebase
@lucasderraugh
Copy link
Collaborator

Thank you again @lapfelix. Apologies on the slow turnaround for this.

@lapfelix
Copy link
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.

@balavor
Copy link

balavor commented Jul 18, 2024

Unbelievable! Thank you so much!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Regression in 1.3.3 from 1.3.2: Rebasing with conflicts fails with internal error
3 participants