search

getodk / release-notes-generator

NPM module to generate release notes with attribution
0 stars 2 forks source link

Issue 7 missing some squash merges #8

Closed ggalmazor closed 5 years ago

ggalmazor commented 5 years ago

Closes #7 (Please, ignore whitespace changes while reviewing.)

For some reason, now squash-merges will show up in git log --merges queries too.

This PR takes care of that by allowing all commits from a git log --merges to show up in the output, which requires changing how we detect PR numbers and authors while parsing the command's output.

This PR also adapts the templates to this fact.

ggalmazor commented 5 years ago

I don't really understand what happened with those commits you're pointing out. Looking at the git log, it's Hélène who authored them. Only by analyzing the parent commits I can get to commits authored by you...

yanokwa commented 5 years ago

I've got some more information on this issue.

In https://github.com/opendatakit/collect/pull/3121/commits, @lognaturel added a commit to the initial PR and I did a merge. The release notes generator shows those two commits as items in the change log.

ggalmazor commented 5 years ago

I see... I guess that makes sense and explains why @lognaturel accidentally high-jacked the authorship?

yanokwa commented 5 years ago

@lognaturel says she changed the title of the merge commit. That is what's breaking the release notes generator.

yanokwa commented 5 years ago

@ggalmazor as you requested, I've run a few tests...

In the Collect repo, I ran release-notes-generator generate . v1.22.0-beta.0 v1.22.0-beta.1. You can find the changes at https://github.com/opendatakit/collect/compare/v1.22.0-beta.0...v1.22.0-beta.1.

The difference between this PR and master is that this PR adds

> - Select appearances improvements (#3079)
>   - Hélène Martin @lognaturel (Nafundi)

I then ran release-notes-generator generate . v1.21.2 v1.22.0-beta.0. You can find the changes at https://github.com/opendatakit/collect/compare/v1.21.2...v1.22.0-beta.0.

The difference this PR and master is that this PR adds

- Updates in field lists (#3023)
  - Hélène Martin @lognaturel (Nafundi)
- Myanmar calendar (#2662)
  - Hélène Martin @lognaturel (Nafundi)
- Update translations (#3055)
  - Hélène Martin @lognaturel (Nafundi)
- Add Malay, remove languages not in Transifex (#3056)
  - Hélène Martin @lognaturel (Nafundi)

I think this is PR is better because

If you can fix the unneeded newlines in the output, I think we should merge.

ggalmazor commented 5 years ago

OK, I've changed it so that there's no empty line between entries. This should be ready to be merged