From 10152b4a3f89241b6e236f6c364323fd08425c69 Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@gmail.com>
Date: Tue, 31 Mar 2015 18:53:32 +0400
Subject: [PATCH] calcul de newver action delete

---
 prel | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/prel b/prel
index f45e032..0a598dd 100755
--- a/prel
+++ b/prel
@@ -218,12 +218,6 @@ if [ "$action" == update ]; then
         ;;
     esac
 
-    if [ -z "$newver" ]; then
-        # le cas échéant, tenter de calculer la version en fonction de la
-        # release
-        [[ "$release" == release-* ]] && newver="${release#release-}"
-    fi
-
     set -- "$release" "$1"
     action=checkout
 fi
@@ -342,8 +336,13 @@ if [ "$action" == merge ]; then
     git checkout master || die
     git merge "$release" -m "Intégration de la branche $release" --no-ff || die
 
+    if [ -z "$newver" ]; then
+        # le cas échéant, tenter de calculer la version en fonction de la release
+        is_release_branch "$release" && newver="${release#release-}"
+    fi
+
     if [ -n "$newver" ]; then
-        estep "Création du tag $newver"
+        estepn "Création du tag $newver"
         git tag "$newver" || die
     fi
 
@@ -357,7 +356,7 @@ if [ "$action" == merge ]; then
     git checkout master || die
     setx branch=git_get_branch
 
-    [ -n "$merge_delete" ] && action=delete
+    action=delete
 fi
 
 if [ "$action" == delete ]; then