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

Cole Miller created 10 months ago

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

Release Notes:

- N/A

Change summary

crates/worktree/src/worktree.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Detailed changes

crates/worktree/src/worktree.rs

@@ -5491,7 +5491,8 @@ impl BackgroundScanner {
                         entry.merge_message = std::fs::read_to_string(
                             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;
                     },
                 );