user-1021
16-07-2016, 11:38 AM
my build scripts determine a version number using
git describe --tags --match v*
which would generate version numbers like v2.94-208-gc98e51c
and this has worked fine until now, mainly because up to v2.94 all the changes were happening in a single branch (master), and thus there was a single thread of change from the last tag to the latest, and even up until the release of v2.95 this still worked as following back down the develop branch eventually hit the last release tag (just before develop was branched out of master).
and this still works fine on the master branch
$ git describe --tags --match v* master
v2.95
and so the build scripts create the right version numbers for the "stable" builds I do.
but it doesn't work on the develop branch any more, because the commit that's tagged v2.95 is only on the master branch, so following back down the develop branch to the latest tag follows all the way back to v2.94, thus -
$ git describe --tags --match v* develop
v2.94-208-gc98e51c
whereas for the same commit I really want something like v2.95-3-gc98e51c
do any git gurus have any suggestions as to how to fix this?
thanks
Jon
git describe --tags --match v*
which would generate version numbers like v2.94-208-gc98e51c
and this has worked fine until now, mainly because up to v2.94 all the changes were happening in a single branch (master), and thus there was a single thread of change from the last tag to the latest, and even up until the release of v2.95 this still worked as following back down the develop branch eventually hit the last release tag (just before develop was branched out of master).
and this still works fine on the master branch
$ git describe --tags --match v* master
v2.95
and so the build scripts create the right version numbers for the "stable" builds I do.
but it doesn't work on the develop branch any more, because the commit that's tagged v2.95 is only on the master branch, so following back down the develop branch to the latest tag follows all the way back to v2.94, thus -
$ git describe --tags --match v* develop
v2.94-208-gc98e51c
whereas for the same commit I really want something like v2.95-3-gc98e51c
do any git gurus have any suggestions as to how to fix this?
thanks
Jon