Skip to content

Commit ac5a8ff

Browse files
committed
Return back comments
1 parent 14971cc commit ac5a8ff

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/bors/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,16 @@ pub fn create_merge_commit_message(pr: handlers::PullRequestData, merge_type: Me
129129

130130
let pr_description = match &merge_type {
131131
// Only keep any lines starting with `CUSTOM_TRY_JOB_PREFIX`.
132+
// If we do not have any custom try jobs, keep the ones that might be in the PR
133+
// description.
132134
MergeType::Try { try_jobs } if try_jobs.is_empty() => pr
133135
.github
134136
.message
135137
.lines()
136138
.map(|l| l.trim())
137139
.filter(|l| l.starts_with(CUSTOM_TRY_JOB_PREFIX))
138140
.join("\n"),
139-
// If we do not have any custom try jobs, keep the ones that might be in the PR
140-
// description.
141+
// If we do have custom jobs, ignore the original description completely
141142
MergeType::Try { .. } => String::new(),
142143
MergeType::Auto => pr.github.message.clone(),
143144
};

0 commit comments

Comments
 (0)