fix(git): Again use the Git CLI to perform the actual reset
#8199
Conversation
This file contains 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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #8199 +/- ##
=========================================
Coverage 67.16% 67.16%
Complexity 2049 2049
=========================================
Files 357 357
Lines 17158 17158
Branches 2461 2461
=========================================
Hits 11525 11525
Misses 4611 4611
Partials 1022 1022
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
JGit still does not support sparse checkouts [1], and its `reset` call turns the sparse checkout done by `git checkout` into a full checkout. So again use the Git CLI to perform the actual reset like done before 8472931, but continue to determine the resolved revision to reset to via JGit. Fixes #8195. [1]: https://bugs.eclipse.org/bugs/show_bug.cgi?id=383772 Signed-off-by: Sebastian Schuberth <[email protected]>
sschuberth
force-pushed
the
jgit-reset-breaks-sparse-checkout
branch
from
0204301 to
fe60bd3
Compare
mnonnenmacher
approved these changes
Jan 31, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
JGit still does not support sparse checkouts 1, and its
resetcall turns the sparse checkout done bygit checkoutinto a full checkout.So again use the Git CLI to perform the actual reset like done before 8472931, but continue to determine the resolved revision to reset to via JGit.
Fixes #8195.