fix: Correctly record missing stages in index for merge conflicts #1907
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 @@
## master #1907 +/- ##
==========================================
+ Coverage 97.77% 97.95% +0.17%
==========================================
Files 49 49
Lines 5261 5269 +8
==========================================
+ Hits 5144 5161 +17
+ Misses 117 108 -9
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
yajo
approved these changes
Dec 30, 2024
pawamoy
commented
Dec 30, 2024
pawamoy
commented
Dec 30, 2024
|
Previous tests already assert that the file is at least marked as unmerged, meaning the |
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.
Fixes #1833.
I didn't add a test, because it would just be asserting that the Git commands do what they are supposed to, but feel free to ask for a test anyway.
I'm also not sure about the logic when a file did not exist in the previous template version, or was deleted in the latest template version: here I just skip the corresponding stage (2 when created, 3 when deleted) in the index, but maybe the whole index update (all 3 stages) could be skipped for such cases, not sure.
I rewrote the explanation comment above, reusing the wording in the SO answer, as I think it's much more readable than the previous comment.