| commit | 38422057fe77075a557ffd9580fe452d9a0b0df9 | [log] [tgz] |
|---|---|---|
| author | Ben Rohlfs <brohlfs@google.com> | Wed Sep 22 08:42:01 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Sep 22 08:42:01 2021 +0000 |
| tree | 0db9320887831a0b9de04b12705db286930aeff1 | |
| parent | e696d730d5446c4f9c5feea476ba7ba18b258e3a [diff] | |
| parent | 282c8d1b9d5e61248fa1af75770b982ea6e73ae4 [diff] |
Merge "Handle absent trailing newline when cherry picking"
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog.ts b/polygerrit-ui/app/elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog.ts index a090aee..fbf57f3 100644 --- a/polygerrit-ui/app/elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog.ts +++ b/polygerrit-ui/app/elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog.ts
@@ -298,6 +298,9 @@ let newMessage = commitMessage; if (changeStatus === 'MERGED') { + if (!newMessage.endsWith('\n')) { + newMessage += '\n'; + } newMessage += '(cherry picked from commit ' + commitNum.toString() + ')'; } this.message = newMessage;
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog_test.js b/polygerrit-ui/app/elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog_test.js index 90fddaa..ff078f0 100644 --- a/polygerrit-ui/app/elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog_test.js +++ b/polygerrit-ui/app/elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog_test.js
@@ -46,6 +46,16 @@ element.project = 'test-project'; }); + test('with message missing newline', () => { + element.changeStatus = 'MERGED'; + element.commitMessage = 'message'; + element.commitNum = '123'; + element.branch = 'master'; + flush(); + const expectedMessage = 'message\n(cherry picked from commit 123)'; + assert.equal(element.message, expectedMessage); + }); + test('with merged change', () => { element.changeStatus = 'MERGED'; element.commitMessage = 'message\n';