fix the way we list changes that will not be included
The git log range is apparently inclusive, which means when we try to produce the list of changes that won't be in a release, we need to stop at the parent of the target commit. Use ~1 to indicate the first parent of the commit, which should always be the commit on the branch into which a merge happened. Change-Id: I7189b296a74445779c2227d63809d7d905cbb2db Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
@@ -206,7 +206,7 @@ def main():
|
||||
print('\nRequest releases from HEAD on %s' % branch)
|
||||
else:
|
||||
git_log(workdir, project['repo'], 'Release will NOT include',
|
||||
'%s..%s' % (requested_sha, head_sha),
|
||||
'%s..%s~1' % (requested_sha, head_sha),
|
||||
extra_args=['--format=%h %ci %s'])
|
||||
|
||||
# Show any requirements changes in the upcoming release.
|
||||
|
||||
Reference in New Issue
Block a user