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

jgit/ clean status check should ignore any 'untracked folders' #13728

Merged
merged 2 commits into from
Sep 6, 2024

Conversation

dweiss
Copy link
Contributor

@dweiss dweiss commented Sep 5, 2024

Fixes #13719.

We can't easily determine whether an "untracked folder" contains something that is .gitignored and currently we report the status as dirty (contrary to what git --porcelain says). This patch just removes all the "untracked folders" logic.

Copy link
Member

@rmuir rmuir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I think this folder logic is what I keep hitting, thank you

@dweiss dweiss self-assigned this Sep 5, 2024
@dweiss dweiss added this to the 10.0.0 milestone Sep 5, 2024
@dweiss
Copy link
Contributor Author

dweiss commented Sep 5, 2024

I'll merge this tomorrow and backport to 9x.

@dweiss dweiss merged commit d7dc57d into apache:main Sep 6, 2024
3 checks passed
asfgit pushed a commit that referenced this pull request Sep 6, 2024
(branch 9x backport)

* Ignore any 'untracked folders' #13719
* Upgrade jgit to 6.10.0.202406032230-r.
@uschindler
Copy link
Contributor

Thanks. I wasn't aware of this extra File walk. Who added this? Thanks for removing it.

@dweiss
Copy link
Contributor Author

dweiss commented Sep 6, 2024

Thanks. I wasn't aware of this extra File walk. Who added this? Thanks for removing it.

Can't remember. Could have been me. Clearly not working in all cases though.

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

Successfully merging this pull request may close these issues.

simplify checkWorkingCopyClean to make backporting easier?
3 participants