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

prel: après avoir fusionné une branche, revenir sur develop

This commit is contained in:
Jephté Clain 2016-02-26 14:03:31 +04:00
parent 131bbe7e3d
commit 40f1bf6be1
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
prel
View File

@ -373,6 +373,7 @@ elif is_release_branch "$branch"; then
release="$branch" release="$branch"
fi fi
final_branch= # branche sur laquelle se placer après avoir fusionné la branche de release
if [ "$action" == merge ]; then if [ "$action" == merge ]; then
confirm= confirm=
@ -433,6 +434,7 @@ ou celle-ci pour pour pousser TOUS les tags:
setx branch=git_get_branch setx branch=git_get_branch
action=delete action=delete
final_branch=develop
fi fi
if [ "$action" == delete -a "$release" != develop ]; then if [ "$action" == delete -a "$release" != develop ]; then
@ -501,3 +503,8 @@ elif [ "$action" == diff ]; then
fi fi
fi fi
fi fi
# en fin de traitement, revenir le cas échéant sur $final_branch
if [ -n "$final_branch" ]; then
git checkout "$final_branch" || die
fi