diff options
| author | Dave Davenport <qball@gmpclient.org> | 2017-03-21 08:37:07 +0100 |
|---|---|---|
| committer | Dave Davenport <qball@gmpclient.org> | 2017-03-21 08:37:07 +0100 |
| commit | f0775b29184d65c1d256d6ab75f8390746036ccc (patch) | |
| tree | 52f26d4b476fac220a87266f6b6ac63fe3dde5ea /script | |
| parent | a5a94730462e877374aa9f110954341ef24f3381 (diff) | |
Don't put g next to 7 char commit has in version.
Hard to select sha in 1.3.1-292-ga5a9473-dirty so
1.3.1-292-git-a5a9473-dirty is easier
Fixes: #578
Diffstat (limited to 'script')
| -rwxr-xr-x | script/get_git_rev.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/script/get_git_rev.sh b/script/get_git_rev.sh index ee718d5e..1e36b6f7 100755 --- a/script/get_git_rev.sh +++ b/script/get_git_rev.sh @@ -7,8 +7,9 @@ GIT=$(which git) if [ -d "${DIR}/.git/" ] && [ -n "${GIT}" ] then echo -n "#define GIT_VERSION \"" > ${FILE}.tmp - REV="$(${GIT} describe --tags --always --dirty) ($(${GIT} describe --tags --always --all | sed -e 's:heads/::'))" - echo -n "${REV}" >> ${FILE}.tmp + BRTG="$(${GIT} describe --tags --always --all | sed -e 's:heads/::')" + REV="$(${GIT} describe --tags --always --dirty| sed -e 's:-g\([a-f0-9]\{7\}\):-git-\1:g')" + echo -n "${REV} (${BRTG})" >> ${FILE}.tmp echo "\"" >> ${FILE}.tmp else echo "#undef GIT_VERSION" > ${FILE}.tmp |