Skip to content

Update merge commit title to mimic github's pattern #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 3, 2019
Merged

Update merge commit title to mimic github's pattern #88

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14b1098
Update merge commit title to mimic github's pattern
chrisdothtml May 31, 2019
6178c50
update based on feedback
chrisdothtml May 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions __tests__/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ describe('probot-app-merge-pr', () => {
.reply(200);
});

const expectedMessage = `https://github.com/fusionjs/test-repo/pull/1
const expectedMessage = `

Co-authored-by: Test User2 <[email protected]>
Co-authored-by: Test User3 <[email protected]>`;

await probot.receive({name: 'issue_comment', payload: fixtures.payload});
expect(await mergeRequest).toEqual({
commit_title: 'Test PR',
commit_title: 'Test PR (https://github.com/fusionjs/test-repo/pull/1)',
commit_message: expectedMessage,
merge_method: 'squash',
});
Expand Down
4 changes: 2 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports = robot => {
}

try {
let commit_message = issue.html_url;
let commit_message = '';

// add all PR commiters as co-authors
// https://help.github.com/articles/creating-a-commit-with-multiple-authors/
Expand Down Expand Up @@ -69,7 +69,7 @@ module.exports = robot => {
await github.pullRequests.merge(
context.repo({
pull_number: issue.number,
commit_title: issue.title,
commit_title: `${issue.title} (${issue.html_url})`,
commit_message,
merge_method,
}),
Expand Down