Fix skipping a file when staging last file in a directory #2767
Conversation
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
Tillerino
commented
Oct 29, 2025
Tillerino
commented
Oct 29, 2025
Tillerino
force-pushed
the
binary-search-error-result
branch
from
8409e2c to
01815be
Compare
Collaborator
|
@Tillerino could you fix the conflicts? |
cruessler
requested changes
Dec 1, 2025
Collaborator
cruessler
left a comment
cruessler
left a comment
There was a problem hiding this comment.
I really like this change as that is something that has been bothering me for quite some time now. Thanks for the fix! I tested the fix briefly and did not find any issues. I left two minor comments, but nothing major.
Collaborator
|
@Tillerino would love to see this land, are you committed to push it over the finish line? |
Tillerino
force-pushed
the
binary-search-error-result
branch
2 times, most recently
from
4ec717d to
14f190e
Compare
Author
|
I rebased and incorporated the requested changes. Ready to go. |
cruessler
requested changes
Dec 17, 2025
Collaborator
cruessler
left a comment
cruessler
left a comment
There was a problem hiding this comment.
One last request: last_selection_index in StatusTree::update is now unused and can be removed. Otherwise this is good to go!
Tillerino
force-pushed
the
binary-search-error-result
branch
from
14f190e to
655cdfb
Compare
cruessler
approved these changes
Dec 19, 2025
Collaborator
cruessler
left a comment
cruessler
left a comment
There was a problem hiding this comment.
Looks good to me, thanks for your contribution! And your patience! :-)
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.
This Pull Request partly addresses #2748.
The "error" result from the binary search was not taken into account after an update to the status tree, which lead to files being skipped when the last file in a directory was staged.
Before:
Screencast_20251029_204232.webm
(skips
zzz)After:
Screencast_20251029_204327.webm
I followed the checklist:
make checkwithout errors