From cd928328a95f28dd7b33909b3611715d25c74228 Mon Sep 17 00:00:00 2001 From: Jephte CLAIN Date: Wed, 1 Apr 2015 12:34:02 +0400 Subject: [PATCH] ne pas supprimer la branche develop --- prel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prel b/prel index 8bda889..baae0c2 100755 --- a/prel +++ b/prel @@ -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"