git: Suggest merge commit message in remote (#36430)

Closes #ISSUE

Adds `merge_message` field to the `UpdateRepository` proto message so
that suggested merge messages are displayed in remote projects.

Release Notes:

- git: Fixed an issue where suggested merge commit messages would not
appear for remote projects
This commit is contained in:
Ben Kunkle 2025-08-18 21:08:20 -05:00 committed by GitHub
parent 6ee06bf2a0
commit 4abfcbaff9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 14 additions and 2 deletions

View file

@ -2774,6 +2774,7 @@ impl RepositorySnapshot {
.iter()
.map(|repo_path| repo_path.to_proto())
.collect(),
merge_message: self.merge.message.as_ref().map(|msg| msg.to_string()),
project_id,
id: self.id.to_proto(),
abs_path: self.work_directory_abs_path.to_proto(),
@ -2836,6 +2837,7 @@ impl RepositorySnapshot {
.iter()
.map(|path| path.as_ref().to_proto())
.collect(),
merge_message: self.merge.message.as_ref().map(|msg| msg.to_string()),
project_id,
id: self.id.to_proto(),
abs_path: self.work_directory_abs_path.to_proto(),
@ -4266,6 +4268,7 @@ impl Repository {
.map(proto_to_commit_details);
self.snapshot.merge.conflicted_paths = conflicted_paths;
self.snapshot.merge.message = update.merge_message.map(SharedString::from);
let edits = update
.removed_statuses