Skip to content

[bug fix] Empty branch merge in change-log#121

Merged
namolnad merged 3 commits intonamolnad:masterfrom
MatsMoll:bugfix/empty-commit-on-branch-change
Jan 3, 2020
Merged

[bug fix] Empty branch merge in change-log#121
namolnad merged 3 commits intonamolnad:masterfrom
MatsMoll:bugfix/empty-commit-on-branch-change

Conversation

@MatsMoll
Copy link
Copy Markdown
Contributor

@MatsMoll MatsMoll commented Dec 25, 2019

A branch merger was recored to it's own commit, but with noe message, author or link. (This was a problem as github's API did not accept it when this was a tags change-log body.)

This sesames to be fixed by removing the --graph flag when fetching the git log.

E.g:

### Features
 - Merge pull request #11 from ...
 - |\ - [Commit](/commit/|\  ) - |\  
 - |/ - [Commit](/commit/|/  ) - |/  
 - Merge pull request #10 from ...
 - |\ - [Commit](/commit/|\  ) - |\  
 - Merge pull request #9 from ...

@namolnad
Copy link
Copy Markdown
Owner

namolnad commented Jan 3, 2020

@MatsMoll thanks so much for the contribution! This looks great — just pulled the branch down and tested it a bit. Seems to work well!

@namolnad
Copy link
Copy Markdown
Owner

namolnad commented Jan 3, 2020

Sorry, approved a little too quickly. Can you add a test case in ChangeLogModelTests.swift to cover the newline option you added?

@MatsMoll
Copy link
Copy Markdown
Contributor Author

MatsMoll commented Jan 3, 2020

Ups, but yes! Will add a test for it

@MatsMoll
Copy link
Copy Markdown
Contributor Author

MatsMoll commented Jan 3, 2020

I did not quite understand the testing framework. But it passes and the output seems to be correct

@namolnad
Copy link
Copy Markdown
Owner

namolnad commented Jan 3, 2020

yeah, looks as though you figured it out — thanks for adding the test and again for the PR! (Not sure why CI isn't running tests/linting, but I ran them locally and all looks well)

@namolnad
Copy link
Copy Markdown
Owner

namolnad commented Jan 3, 2020

btw if you want to check out the testing framework it's @pointfreeco's snapshot tool: https://github.com/pointfreeco/swift-snapshot-testing

@namolnad namolnad merged commit 97e9959 into namolnad:master Jan 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants