git: Take only the first line of MERGE_MSG (#25263)

The rest of the generated message consists of comments that are
redundant with what we show in the panel.

Release Notes:

- N/A
This commit is contained in:
Cole Miller 2025-02-20 13:53:37 -05:00 committed by GitHub
parent 21bb7242ea
commit 3116850688
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -5491,7 +5491,8 @@ impl BackgroundScanner {
entry.merge_message = std::fs::read_to_string( entry.merge_message = std::fs::read_to_string(
local_repository.dot_git_dir_abs_path.join("MERGE_MSG"), local_repository.dot_git_dir_abs_path.join("MERGE_MSG"),
) )
.ok(); .ok()
.and_then(|merge_msg| Some(merge_msg.lines().next()?.to_owned()));
entry.status_scan_id += 1; entry.status_scan_id += 1;
}, },
); );