git: Fix file history view shows duplicate entries when clicking on Load More
#44773
+27
−23
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
cla-bot
bot
added
the
cla-signed
…Load More` This is because the git command parameter `--skip` doesn't work correctly if it's used with `--follow`
relaxcn
force-pushed
the
file_history_duplicate_entries
branch
from
1508c62 to
4a4ea1a
Compare
cameron1024
reviewed
Dec 16, 2025
Contributor
cameron1024
left a comment
cameron1024
left a comment
There was a problem hiding this comment.
Thanks for the contribution 🙏 Small tweak needed but otherwise looking good
| uint64 repository_id = 3; | ||
| string path = 4; | ||
| uint64 skip = 5; | ||
| optional string last_commit_hash = 5; |
Contributor
There was a problem hiding this comment.
We shouldn't change the type of an existing field that goes through collab (since an old collab server may be used with a newer Zed client or vice versa).
If we replace this field with reserved 5 and add this as a new field, we should be good.
Author
There was a problem hiding this comment.
Thank you.
I will add a new field instead of removing the old one.
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 is because the git command parameter
--skipdoesn't work correctly if it's used with--follow.So I use a cursor-based pagination approach (using commit hash +
^notation) to reliably fetch the next page of file history.Closes #44591
Release Notes:
Load More.