diff options
author | John Stebbins <[email protected]> | 2015-08-25 14:26:59 -0700 |
---|---|---|
committer | John Stebbins <[email protected]> | 2015-08-25 14:26:59 -0700 |
commit | 9d0a09a7429676785afc89ac565892f2ed9bfb3a (patch) | |
tree | 6ba7a07757b677e6b07104682c4ec774ff0b96ab /scripts | |
parent | 4889bc95883dd2cb0eb679d381d15385b930bcfa (diff) |
build: fix errors in last commit
Thanks BradleyS
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/repo-info.sh | 4 | ||||
-rwxr-xr-x | scripts/tag-release.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/repo-info.sh b/scripts/repo-info.sh index 72d974d04..675a2cf62 100755 --- a/scripts/repo-info.sh +++ b/scripts/repo-info.sh @@ -43,7 +43,7 @@ if [[ ${TAG} ]]; then else TAG=$(${GIT_EXE} describe $(${GIT_EXE} rev-list --tags --max-count=1)) if [[ ${TAG} ]]; then - REV=$(${GIT_EXE} rev-list $(${GIT_EXE} merge-base 0.10.2 HEAD).. --count) + REV=$(${GIT_EXE} rev-list $(${GIT_EXE} merge-base ${TAG} HEAD).. --count) else REV=$(${GIT_EXE} rev-list HEAD --count) fi @@ -57,7 +57,7 @@ fi DATE=$(${GIT_EXE} log -1 --format="format:%ai") # Output -# Only write tag and rev if they exist. A fresh clone currently has no tags. +# Only write tag and rev if they exist. echo "URL=${URL}" echo "HASH=${HASH}" if [[ ${TAG} ]]; then echo "TAG=${TAG}"; fi diff --git a/scripts/tag-release.sh b/scripts/tag-release.sh index 64f98103e..66e33e308 100755 --- a/scripts/tag-release.sh +++ b/scripts/tag-release.sh @@ -38,7 +38,7 @@ if [ ${ERR} -ne 0 ]; then exit ${ERR} fi -# creat tag +# create tag git tag -a "${TAG}" -m "Release ${TAG}" HEAD ERR=$? if [ ${ERR} -ne 0 ]; then |