Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fold git merge messages into commit editor placeholder text (#26992)

Browse source 
This PR changes the git commit message editors to surface git's
suggested merge message, if any, as placeholder text, as opposed to
"real" buffer text as was previously the case.

Release Notes:

- Changed git commit message editors to use placeholder text for git's
suggested merge messages
This commit is contained in:
Cole Miller 2025-03-18 13:21:20 -04:00 • committed by GitHub
parent e7bba1c252
commit 7f23875c5e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 24 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/project/src/git.rs
View file

@ -605,20 +605,9 @@ impl GitStore {
}
// Update the statuses and merge message but keep everything else.
let existing_handle = handle.clone();
existing_handle.update(cx, |existing_handle, cx| {
existing_handle.update(cx, |existing_handle, _| {
existing_handle.repository_entry = repo.clone();
if matches!(git_repo, GitRepo::Local { .. })
&& existing_handle.merge_message != merge_message
{
if let (Some(merge_message), Some(buffer)) =
(&merge_message, &existing_handle.commit_message_buffer)
{
buffer.update(cx, |buffer, cx| {
if buffer.is_empty() {
buffer.set_text(merge_message.as_str(), cx);
}
})
}
if matches!(git_repo, GitRepo::Local { .. }) {
existing_handle.merge_message = merge_message;
}
});
@ -2177,7 +2166,6 @@ impl Repository {
buffer_store: Entity<BufferStore>,
cx: &mut Context<Self>,
) -> Task<Result<Entity<Buffer>>> {
let merge_message = self.merge_message.clone();
cx.spawn(|repository, mut cx| async move {
let buffer = buffer_store
.update(&mut cx, |buffer_store, cx| buffer_store.create_buffer(cx))?
@ -2190,12 +2178,6 @@ impl Repository {
})?;
}
if let Some(merge_message) = merge_message {
buffer.update(&mut cx, |buffer, cx| {
buffer.set_text(merge_message.as_str(), cx)
})?;
}
repository.update(&mut cx, |repository, _| {
repository.commit_message_buffer = Some(buffer.clone());
})?;