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:
parent
21bb7242ea
commit
3116850688
1 changed files with 2 additions and 1 deletions
|
@ -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;
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue