git-upstream

  1. Bug #1648029
  2. Comment #7

Comment 7 for bug 1648029

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to git-upstream (master)

Reviewed: https://review.openstack.org/408245
Committed: https://git.openstack.org/cgit/openstack/git-upstream/commit/?id=6415738c1c3c9d26774f3e0f814d122f549ccf8b
Submitter: Jenkins
Branch: master

commit 6415738c1c3c9d26774f3e0f814d122f549ccf8b
Author: Darragh Bailey <email address hidden>
Date: Wed Dec 7 17:44:32 2016 +0000

    Handle multiple non-contributing commits being merged

    When encountering multiple non-contributing commits included in a merge
    that is TREESAME to the existing contents, ensure a list of all commits
    being brought in by that merge are included in the list to be pruned
    from history.

    Change-Id: I643e0923f8967f9b70d10b8796688b782681bfe0
    Closes-Bug: #1648029