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

Wrong pull request version when branching from a tagged merge commit #1211

Closed
wants to merge 2 commits into from
Closed

Wrong pull request version when branching from a tagged merge commit #1211

wants to merge 2 commits into from

Conversation

ghost
Copy link

@ghost ghost commented May 4, 2017

Switch normalise to true and test will succeed with correct version.

@ghost ghost changed the title Added test for checking pull request version when branching from a tagged merge commit Wrong pull request version when branching from a tagged merge commit May 4, 2017
@asbjornu
Copy link
Member

@baunegaard: Can you please rebase this on the current HEAD of master? The easiest way to rebase would be to reset your branch to upstream/master and then cherry-pick 6f116e7. Please let me know if you need assistance.

@JakeGinnivan
Copy link
Contributor

The reason this test fails is that the tag is actually still checked out.

*   132ee75 52 minutes ago  (refs/pull/2/merge)
|\  
| * 6e55e51 53 minutes ago  (feature/bar)
|/  
*   8d8c85e 55 minutes ago  (HEAD -> master, tag: 1.0.0)
|\  
| * e6f2952 56 minutes ago  (feature/foo)
|/  
* 5db17ea 58 minutes ago

When you normalise HEAD will move to the pull request ref. Unsure what the actual issue is here, going to close, if you can clarify that would be awesome.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants