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

Failed to inherit Increment branch configuration, ended up with <mybranch>, origin/<mybranch> #2419

Closed
gerwinjansen opened this issue Oct 7, 2020 · 1 comment · Fixed by #2420
Labels
Milestone

Comments

@gerwinjansen
Copy link
Contributor

GitVersion is calculating the wrong version, when a parent branch exists both as local and remote branch.
In that case, it print this warning:

WARN [10/07/20 14:29:24:80] Failed to inherit Increment branch configuration, ended up with: support/v1.0.x, origin/support/v1.0.x
Falling back to develop branch config

The default Increment of the develop branch is Minor, whereas Patch is expected for the support branch.

Steps to Reproduce

git init remote
cd remote
git commit --allow-empty -m "init"
git tag -a -m "Release 1.0" v1.0
git checkout -b develop
git commit --allow-empty -m "new feature"
git checkout master
git checkout -b support/v1.0.x
git commit --allow-empty -m "hotfix"
git tag -a -m "Release 1.0.1" v1.0.1

cd ..
git clone remote local
cd local
git checkout master
git checkout develop
git checkout support/v1.0.x
git checkout -b bugfix
git commit --allow-empty -m "bugfix"

Expected Behavior

"FullSemVer":"1.0.2-bugfix.1+1"

Actual Behavior

"FullSemVer":"1.1.0-bugfix.1+2"

Solution direction

Treat the local and remote branches as equal if they have the same name

@github-actions
Copy link

🎉 This issue has been resolved in version 5.8.0 🎉
The release is available on:

Your GitReleaseManager bot 📦🚀

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

Successfully merging a pull request may close this issue.

3 participants