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
| res.selection = Some(1); | ||
|
|
||
| res.update(&string_vec_to_status(&["d", "c", "a"])).unwrap(); | ||
| res.update(&string_vec_to_status(&["a", "c", "d"])).unwrap(); |
There was a problem hiding this comment.
I had to sort the list to keep this test working. The binary search assumes that the status list is sorted, but this is never validated in the status tree. I think this test used to pass accidentally, since the list is so short.
Tillerino
commented
Oct 29, 2025
| ); | ||
|
|
||
| res.update(&string_vec_to_status(&["c", "d"])).unwrap(); | ||
| assert_eq!(res.selected_item().unwrap().info.full_path, "c"); |
There was a problem hiding this comment.
Without the fix, the selection skips c and jumps straight to d.
Tillerino
force-pushed
the
binary-search-error-result
branch
from
8409e2c to
01815be
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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