X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=autogen.sh;h=03fb91a05f280ef5c9d057f8c0d0ec28b7d6affd;hb=53c2162223a524221a5672af07da9f1110de5a26;hp=4b2ee135e24621c1ea8eb16b040c9406f819f1b2;hpb=64a1f73619f4faec2f15fb02f9b1d57cde397ee8;p=sxemacs diff --git a/autogen.sh b/autogen.sh index 4b2ee13..03fb91a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -52,14 +52,21 @@ emacs_is_beta=t if test -n "$GIT" -a -n "$($GIT symbolic-ref HEAD 2>/dev/null)"; then TREE_VERSION="$($GIT tag|tail -n1|tr -d v)" GIT_VERSION="$($GIT describe | head -n1)" + GIT_BRANCH="$(git branch --no-color | awk '/^\*/ { print $2 }')" IN_GIT="1" fi if test -z "$TREE_VERSION"; then TREE_VERSION="$EXPECTED_TREE_VERSION" if test -n "$IN_GIT"; then - echo "If you cloned this branch into your own you should issue:" + echo "If you cloned this branch into your own you could issue:" echo "\tgit tag -s v${TREE_VERSION}." - echo "\tgit push --tag" + echo "" + echo "Be careful about pushing the tags as they probably will be " + echo "more of a nuisance..." + echo "" + TREE_VERSION="$EXPECTED_TREE_VERSION.$GIT_BRANCH" + echo "For now I am assuming the tre version will be $TREE_VERSION" + echo "" fi fi if test -z "$GIT_VERSION"; then