utiliser la version au lieu de la release
This commit is contained in:
parent
55893145dc
commit
6258a6ba76
6
prel
6
prel
|
@ -210,6 +210,7 @@ if [ "$action" == update ]; then
|
|||
simple_menu release branches \
|
||||
-t "Basculer vers une nouvelle branche de release" \
|
||||
-m "Veuillez choisir la branche à créer"
|
||||
[ "$release" != master ] && newver="${release#release-}"
|
||||
;;
|
||||
major)
|
||||
setx newver=pver -s "$oldver" -ux "${pver_opts[@]}"
|
||||
|
@ -291,7 +292,10 @@ Vous allez créer la nouvelle branche de release ${COULEUR_VERTE}$release${COULE
|
|||
pver -uv "$newver" && commitmsg="Init changelog & version $newver"
|
||||
fi
|
||||
|
||||
changelog="## Version $release du $(date +%d/%m/%Y-%H:%M)"
|
||||
version="$newver"
|
||||
[ -n "$version" ] || version="$release"
|
||||
|
||||
changelog="## Version $version du $(date +%d/%m/%Y-%H:%M)"
|
||||
setx mergebase=git merge-base master "$release"
|
||||
setxp modifs=git log --oneline "$mergebase..$release" // grep -v "Intégration de la branche release-"
|
||||
[ -n "$modifs" ] && changelog="$changelog
|
||||
|
|
Loading…
Reference in New Issue