diff --git a/bin/pdev b/bin/pdev index 10c522c..ede3ddc 100755 --- a/bin/pdev +++ b/bin/pdev @@ -36,7 +36,7 @@ Ce script va local script=".git/pman-merge.sh" local -a push_branches delete_branches - local after + local hook local comment= local or_die=" || exit 1" @@ -47,10 +47,15 @@ Ce script va if [ -n "\$merge" ]; then esection "Fusionner la branche" EOF - _mscript_merge_branch - after="AFTER_MERGE_${SrcType^^}"; [ -n "${!after}" ] && _scripta < AFTER_MERGE_ AFTER_DELETE_ + BEFORE_PUSH_ AFTER_PUSH_ -xxxType valant UPSTREAM, DEVELOP, FEATURE, RELEASE, MAIN, HOTFIX, DIST" +srcType et destType pouvant valoir UPSTREAM, DEVELOP, FEATURE, RELEASE, MAIN, HOTFIX, DIST" -d:,--chdir:BASEDIR chdir= "répertoire dans lequel se placer avant de lancer les opérations" -O:,--origin Origin= "++\ origine à partir de laquelle les branches distantes sont considérées" diff --git a/bin/prel b/bin/prel index 8dceaaa..026c046 100755 --- a/bin/prel +++ b/bin/prel @@ -85,6 +85,11 @@ Vous devrez: # create if [ -n "\$create" ]; then esection "Création de la release" +EOF + [ -n "$BEFORE_CREATE_RELEASE" ] && _scripta <