summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authormvglasow <michael -at- vonglasow.com>2015-11-19 13:20:24 +0100
committermvglasow <michael -at- vonglasow.com>2015-11-19 13:20:24 +0100
commit9df63b5755630cfec2747efe2b28ada24ddf90e9 (patch)
treee6be8cb5115c39b77e044d30eb612e661ba72cf0 /ci
parentc5624e812568d690cfdc6f13da0ad023c9d54f2b (diff)
downloadnavit-9df63b5755630cfec2747efe2b28ada24ddf90e9.tar.gz
Fix:ci:Another attempt to deal with long commit messages
Signed-off-by: mvglasow <michael -at- vonglasow.com>
Diffstat (limited to 'ci')
-rw-r--r--ci/update_version.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/update_version.sh b/ci/update_version.sh
index 370d37a46..ea1d70d71 100644
--- a/ci/update_version.sh
+++ b/ci/update_version.sh
@@ -2,7 +2,7 @@ if [ -z "$CIRCLE_BUILD_NUM" -o "$CIRCLE_PROJECT_USERNAME" != "navit-gps" ] ; the
exit
fi
-if ! git --no-pager log -n 1 ; then
+if ! git log -n 1 --oneline ; then
echo "This script should be run from the versioned directory"
exit 1
fi
@@ -14,7 +14,7 @@ fi
TAG=R$(( 5658 + $CIRCLE_BUILD_NUM ))
if [ "$1" == "prepare" ] ; then
- git --no-pager log -1 --format="%H %d" | grep 'tag: R'
+ git log -1 --format="%H %d" | grep 'tag: R'
if [ $? -eq 0 ] ; then
echo "This commit is already tagged."
exit
@@ -24,7 +24,7 @@ if [ "$1" == "prepare" ] ; then
fi
if [ "$1" == "push" ] ; then
- git --no-pager log -1 --format="%H %d" | grep "tag: $TAG"
+ git log -1 --format="%H %d" | grep "tag: $TAG"
if [ $? -eq 0 ] ; then
echo Pushing tag $TAG to origin...
git push origin $TAG