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

Already on GitHub? Sign in to your account

Tag master and merge it into develop when finishing releases and hotfixe... #355

Open
wants to merge 1 commit into
from

Conversation

Projects
None yet
3 participants

minj commented Feb 20, 2014

...s.

Fixes git-describe inconsistencies.

This PR actually places the tags properly so that git-describe always returns exact tag on master.

I also experienced this issue to find that a pull request has already been made.

Tagging the wrong commit can cause problems where a release is being worked on, and a hotfix is needed. The hotfix is tagged on the hotfix branch, and merged into master, so deploying from the tagged commit is ok.

If a release is then finished, it's merged back into master, but the tag is on the release branch, meaning if someone was to deplot from the new version tag, eg 1.0.2 for example, the hotfix (eg 1.0.1a) would not be included in the 1.0.2 tag. The hotfix would only be applied with the next version 1.0.3.

The gitflow branching model at http://nvie.com/posts/a-successful-git-branching-model/ clearly shows that master should be tagged, not the release branch or the hotfix branch. This works ok when using gitflow within the SourceTree app, but not when using the git flow cli (This repo).

When we see this happen, we can re tag manually, but that's not ideal.

@sunsided sunsided referenced this pull request in GitTools/GitVersion Sep 14, 2015

Closed

Version numbers are off by one when merging to master #639

myjpa commented Feb 2, 2017

any progress on this? This pull request should fixes wrong tagging on finishing a release

Given the last commit was in 2012... I don't see anything in this project being fixed or updated =/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment