Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

Ignore spaces in empty lines

Browse Source
This commit is contained in:
René Pfeuffer
2020-06-08 13:53:07 +02:00
parent 79c1057dd8
commit 031605a327
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-webapp/src/main/java/sonia/scm/repository/ChangesetDescriptionTrailerProvider.java
View File

@@ -65,7 +65,7 @@ public class ChangesetDescriptionTrailerProvider implements ChangesetPreProcesso
} }
public void handleLine(Scanner scanner, String line) { public void handleLine(Scanner scanner, String line) {
if (line.isEmpty()) { if (line.trim().isEmpty()) {
handleEmptyLine(scanner, line); handleEmptyLine(scanner, line);
return; return;
} }

12
scm-webapp/src/test/java/sonia/scm/repository/ChangesetDescriptionTrailerProviderTest.java
View File

@@ -161,6 +161,18 @@ class ChangesetDescriptionTrailerProviderTest {
assertThat(changeset.getDescription()).isEqualTo(originalCommitMessage); assertThat(changeset.getDescription()).isEqualTo(originalCommitMessage);
} }
@Test
void shouldIgnoreWhitespacesInEmptyLines() {
String originalCommitMessage = "zaphod beeblebrox\n \n" +
"Committed-by: Tricia McMillan <trillian@hitchhiker.org>";
Changeset changeset = createChangeset(originalCommitMessage);
changesetDescriptionTrailers.createPreProcessor(REPOSITORY).process(changeset);
Collection<Trailer> trailers = changeset.getTrailers();
assertThat(trailers).isNotEmpty();
}
private Changeset createChangeset(String commitMessage) { private Changeset createChangeset(String commitMessage) {
Changeset changeset = new Changeset(); Changeset changeset = new Changeset();
changeset.setDescription(commitMessage); changeset.setDescription(commitMessage);