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

Intégration de la branche ptools

This commit is contained in:
Jephté Clain 2015-04-01 12:34:11 +04:00
parent 3f1dc3e6f5 cd928328a9
commit 10a7d4e57c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prel
View File

@ -398,7 +398,7 @@ if [ "$action" == merge ]; then
action=delete
fi
if [ "$action" == delete ]; then
if [ "$action" == delete -a "$release" != develop ]; then
if [ -z "$force_delete" ]; then
# vérifier que la branche a été fusionnée
git_is_merged "$release" master || die "Refus de supprimer la branche $release: elle n'a pas été fusionnée dans master"