tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release.sh: learn to merge maint branch into next before releasing

Browse Source 
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Nicolas Sebrecht 2016-07-22 09:50:06 +02:00
parent 034c55a278
commit 6d0dba0d86
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/release.sh
View File

@ -138,6 +138,14 @@ function checkout_next () {
} }
function merge_maint () {
debug 'in merge_maint'
git merge --quiet -Xours maint || {
die 7 "Could not merge 'maint' branch"
}
}
function get_version () { function get_version () {
debug 'in get_version' debug 'in get_version'
echo "v$(./offlineimap.py --version)" echo "v$(./offlineimap.py --version)"
@ -423,6 +431,7 @@ function run () {
check_dirty check_dirty
prepare_env prepare_env
checkout_next checkout_next
merge_maint
clear clear
welcome welcome