bd6fecc858
OpenStack used to use null-merges to bring final release tags from stable branches back into the master branch. This confuses the regular traversal because it makes that stable branch appear to be part of master and/or the later stable branch. Update the scanner so that when it hit one of those merge commits, it skips it and take the first parent so it continues to traverse the branch being scanned. Change-Id: I90722a3946f691e8f58a52e68ee455d6530f047a Closes-Bug: #1695057 Signed-off-by: Doug Hellmann <doug@doughellmann.com>
19 lines
741 B
YAML
19 lines
741 B
YAML
---
|
|
features:
|
|
- |
|
|
By default, reno now ignores "null" merge commits that bring in
|
|
tags from other threads. The new configuration option
|
|
``ignore_null_merges`` controls this behavior. Setting the flag to
|
|
False restores the previous behavior in which the null-merge
|
|
commits were traversed like any other merge commit.
|
|
upgrade:
|
|
- |
|
|
The new configuration option ``ignore_null_merges`` causes the
|
|
scanner to ignore merge commits with no changes when one of the
|
|
parents being merged in has a release tag on it.
|
|
fixes:
|
|
- |
|
|
This release fixes a problem with the scanner that may have caused
|
|
it to stop scanning a branch prematurely when the tag from another
|
|
branch had been merged into the history.
|