From d9dcea515418af6ad88655ea869ace89801895f9 Mon Sep 17 00:00:00 2001 From: Romain Derocle Date: Thu, 14 Jan 2016 11:58:45 +0100 Subject: [PATCH] do not try to remove TWGIT_PREFIX_TAG if it is empty --- inc/common.inc.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/inc/common.inc.sh b/inc/common.inc.sh index b7a402c..e76bcd8 100644 --- a/inc/common.inc.sh +++ b/inc/common.inc.sh @@ -345,8 +345,13 @@ function get_current_branch () { function get_all_tags () { local n="$1" [ -z "$n" ] && n=10000 # pour tout retourner - git tag | grep -E '^'$TWGIT_PREFIX_TAG'[0-9]+\.[0-9]+\.[0-9]+$' | sed "s/$TWGIT_PREFIX_TAG//" | sed 's/\./;/g' \ - | sort --field-separator=";" -k1n -k2n -k3n | sed 's/;/./g' | tail -n $n | sed "s/^/$TWGIT_PREFIX_TAG/" + if [ -z "$TWGIT_PREFIX_TAG" ]; then + git tag | sed 's/\./;/g' \ + | sort --field-separator=";" -k1n -k2n -k3n | sed 's/;/./g' | tail -n $n + else + git tag | grep -E '^'$TWGIT_PREFIX_TAG'[0-9]+\.[0-9]+\.[0-9]+$' | sed "s/$TWGIT_PREFIX_TAG//" | sed 's/\./;/g' \ + | sort --field-separator=";" -k1n -k2n -k3n | sed 's/;/./g' | tail -n $n | sed "s/^/$TWGIT_PREFIX_TAG/" + fi } ##