fix changelog to handle PR's that have a merge coming from master #2625
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
LGTM |
| // PR's that have merged from some master as it is usually a merge | ||
| // from our master making it cyclical. (just screws up the PR api requests | ||
| // to github) | ||
| return commit.indexOf('Merge pull') == 0 && !(/\/master$/.test(commit)); |
There was a problem hiding this comment.
actually ive removed this code and changed the git command to:
git log canary...some-tag --merges --first-parent
which will prevent those commits from showing up in the commit list i get
erwinmombay
force-pushed
the
fix-cyc-changelog
branch
2 times, most recently
from
b7e90a7 to
7aaab52
Compare
erwinmombay
force-pushed
the
fix-cyc-changelog
branch
from
7aaab52 to
c1a51c2
Compare
|
LGTM |
erwinmombay
added a commit
that referenced
this pull request
Mar 17, 2016
fix changelog to handle PR's that have a merge coming from master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@mkhatib can you take a look?
see sample of this in #2589