Uploaded image for project: 'Evergreen'
  1. Evergreen
  2. EVG-3446

Cannot patch if no correspondingly-named branch is available locally

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Open
    • Priority: Major - P3
    • Resolution: Unresolved
    • Affects Version/s: None
    • Fix Version/s: Backlog
    • Component/s: app
    • Labels:

      Description

      The Evergreen command line tool uses branch+"@{upstream}" to get the merge-base commit for the current commit. "branch" is the name of the configured upstream branch. What this does is get the merge-base commit for the branch which is upstream of the local branch of the same name, which isn't the same thing. So for instance if the upstream branch is v4.0 and I'm on some patch branch which has an upstream of v4.0, but I do not have a local branch named v4.0, and I try to do an "evergreen patch", I get

      Error getting merge base: 'git merge-base v4.0@{upstream} HEAD' failed: fatal: no such branch: 'v4.0'
      (exit status 128): exit status 128

      The actual reference to the upstream v4.0 is not "v4.0@{upstream}" but "remotes/origin/v4.0".

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              backlog-server-evg Backlog - Evergreen Team
              Reporter:
              matthew.russotto Matthew Russotto
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

                Dates

                Created:
                Updated: