Uploaded image for project: 'Vanagon'
  1. Vanagon
  2. VANAGON-140

Use --first-parent when generating a version based on git-describe output

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Accepted
    • Priority: Normal
    • Resolution: Unresolved
    • Affects Version/s: None
    • Fix Version/s: None
    • Labels:
    • Template:
    • Team:
      Night's Watch
    • Method Found:
      Needs Assessment
    • QA Risk Assessment:
      Needs Assessment

      Description

      Right now, if a new tag from an older branch of a vanagon repo is merged up to a branch with a later version number, the version produced by version_from_git will be incorrect, since it comes from the most recent tag (which is too low in this scenario). We're seeing this with puppet-agent, where 5.5.x tags merged into master throw off the generated version number. We could get around this by using the --first-parent option while git-describing.

      One place we'll need to be very careful with this is when merging release branches that have new changes backwards into the mainline branches. The "delete release branch" step of the package validation pipeline must be updated to make sure nothing gets the wrong version (checkout X.Y.Z-release; merge X.Y.x; push HEAD X.Y.x)

        Attachments

          Activity

            People

            Assignee:
            Unassigned
            Reporter:
            casey.williams Casey Williams
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Dates

              Created:
              Updated:

                Zendesk Support