modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

calcul de newver 

action delete
This commit is contained in:
Jephte CLAIN 2015-03-31 18:53:32 +04:00
parent 6c8e750d31
commit 10152b4a3f
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
prel
View File

@ -218,12 +218,6 @@ if [ "$action" == update ]; then
;; ;;
esac 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" set -- "$release" "$1"
action=checkout action=checkout
fi fi
@ -342,8 +336,13 @@ if [ "$action" == merge ]; then
git checkout master || die git checkout master || die
git merge "$release" -m "Intégration de la branche $release" --no-ff || 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 if [ -n "$newver" ]; then
estep "Création du tag $newver" estepn "Création du tag $newver"
git tag "$newver" || die git tag "$newver" || die
fi fi
@ -357,7 +356,7 @@ if [ "$action" == merge ]; then
git checkout master || die git checkout master || die
setx branch=git_get_branch setx branch=git_get_branch
[ -n "$merge_delete" ] && action=delete action=delete
fi fi
if [ "$action" == delete ]; then if [ "$action" == delete ]; then