andrew/versioners
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various bugs in gitversion

Browse Source
This commit is contained in:
Andrew Kesterson
2013-05-19 10:50:47 -04:00
parent 40ac4b926f
commit 043deb708b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gitversion
View File

@@ -9,9 +9,10 @@ fi
REBUILDING=0 REBUILDING=0
SHA1=$(git rev-parse HEAD) SHA1=$(git rev-parse HEAD)
TAG=$(git describe --tags `git rev-list --tags --max-count=1 HEAD` 2>/dev/null) TAG=$(git describe --tags --abbrev=0 `git rev-list --tags --max-count=1 HEAD` 2>/dev/null)
BUILD=0 BUILD=0
CHANGELOG="$(git log --format="format:$LOGSPEC" ${BRANCH}@{0}..HEAD)" TAGSHA=$(git rev-list $TAG | head -n 1)
CHANGELOG="$(git log --format="format:$LOGSPEC" ${TAGSHA}..HEAD)"
if [ "$TAG" == "" ]; then if [ "$TAG" == "" ]; then
BUILD=0 BUILD=0
REBUILDING=1 REBUILDING=1
@@ -19,7 +20,6 @@ if [ "$TAG" == "" ]; then
else else
MAJOR=$(echo $TAG | cut -d , -f 2) MAJOR=$(echo $TAG | cut -d , -f 2)
BUILD=$(echo $TAG | cut -d , -f 3) BUILD=$(echo $TAG | cut -d , -f 3)
TAGSHA=$(git rev-list $TAG | head -n 1)
if [ "$TAGSHA" != "$SHA1" ]; then if [ "$TAGSHA" != "$SHA1" ]; then
CHANGELOG="$(git log --format="format:$LOGSPEC" $TAGSHA..$SHA1)" CHANGELOG="$(git log --format="format:$LOGSPEC" $TAGSHA..$SHA1)"
BUILD=$(expr $BUILD + 1) BUILD=$(expr $BUILD + 1)