project: Load git diff bases concurrently - #55480
Merged
Merged
Conversation
Use `future::join` when loading index and committed text for buffer diff bases, while keeping skipped loads as ready None futures. Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
cla-bot
Bot
added
the
cla-signed
Veykril
approved these changes
May 4, 2026
Veykril
enabled auto-merge
May 4, 2026 06:08
Merged
via the queue into
zed-industries:main
with commit May 5, 2026
8d153d7
51 of 53 checks passed
ebaah46
pushed a commit
to ebaah46/zed
that referenced
this pull request
May 6, 2026
Use `future::join` when loading index and committed text for buffer diff bases, while keeping skipped loads as ready None futures. Release Notes: - N/A Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
Use `future::join` when loading index and committed text for buffer diff bases, while keeping skipped loads as ready None futures. Release Notes: - N/A Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
Use `future::join` when loading index and committed text for buffer diff bases, while keeping skipped loads as ready None futures. Release Notes: - N/A Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Use
future::joinwhen loading index and committed text for buffer diff bases, while keeping skipped loads as ready None futures.Release Notes: