Rework shared commit editors #24274
Merged
Rework shared commit editors #24274
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
* Do load COMMIT_EDITMSG contents to ensure regular git commit flow with `editor = zed --wait` is not broken. * Only update the commit editor on git repo changes * Always clean commit editor's in-memory contents when updating the editor # Conflicts: # crates/git_ui/src/git_panel.rs
Uses https://github.com/d1y/git_firefly/tree/1033c0b57ec88a002cb68efc64c8d9bf5c212e30 language-related definitions co-authored-by: Conrad Irwin <conrad@zed.dev> co-authored-by: d1y <chenhonzhou@gmail.com>
Co-authored-by: Smit <smit@zed.dev>
cla-bot
bot
added
the
cla-signed
SomeoneToIgnore
changed the title
SomeoneToIgnore
force-pushed
the
kb/better-empty-commit-messages
branch
from
71236bd to
d4d38fb
Compare
osiewicz
pushed a commit
to RemcoSmitsDev/zed
that referenced
this pull request
Feb 5, 2025
Rework of zed-industries#24130 Uses https://github.com/d1y/git_firefly/tree/1033c0b57ec88a002cb68efc64c8d9bf5c212e30 `COMMIT_EDITMSG` language-related definitions (thanks @d1y ) Instead of using real `.git/COMMIT_EDITMSG` file, create a buffer without FS representation, stored in the `Repository` and shared the regular way via the `BufferStore`. Adds a knowledge of what `Git Commit` language is, and uses it in the buffers which are rendered in the git panel. Release Notes: - N/A --------- Co-authored-by: Conrad Irwin <conrad@zed.dev> Co-authored-by: d1y <chenhonzhou@gmail.com> Co-authored-by: Smit <smit@zed.dev>
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.
Rework of #24130
Uses https://github.com/d1y/git_firefly/tree/1033c0b57ec88a002cb68efc64c8d9bf5c212e30
COMMIT_EDITMSGlanguage-related definitions (thanks @d1y )Instead of using real
.git/COMMIT_EDITMSGfile, create a buffer without FS representation, stored in theRepositoryand shared the regular way via theBufferStore.Adds a knowledge of what
Git Commitlanguage is, and uses it in the buffers which are rendered in the git panel.Release Notes: