Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: correctly handle merge commits when calculating a build tag #226

Commits on Nov 9, 2022

  1. build: correctly handle merge commits when calculating a build tag (#225

    )
    
    Merge commits were incorrectly handled due to the named use of `git rev-list`,
    which does not give an ancestry path as I expected, but simply a list of
    unique commits between the two refs.
    
    Additionally, the check for the base tag was wrong in the face of merge
    commits, since a tag could be an ancestor through a merge commit, but not
    be the actual base of the branch.
    
    Both of these issues resulted in an incorrect tag being calculated, as well
    as a build slowdown due to the iteration over all of the commits from the
    other parent of the merge commit, which is unneeded.
    
    While at it, add logic for caching the build tag in order to speed up
    builds when the checked-out git tree hasn't changed.
    isaac-io committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    5118aab View commit details
    Browse the repository at this point in the history