1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
|
#! /bin/sh
if [ $# -eq 0 ]; then
tag="`python setup.py --version`"
commit="$tag"~
elif [ $# -eq 1 ]; then
commit="$1"
else
echo "Usage: $0 [commit]" >&2
exit 1
fi &&
. `dirname $0`/split_tag.sh &&
split_tag $commit
if [ $micro -eq 0 -a \( $state = final -o $state = post \) ] &&
git branch --merged master | grep -Fqw maint; then
git checkout maint &&
git merge --ff-only master &&
git checkout master
else:
git checkout master &&
git merge --ff-only maint ||
git merge --strategy=ours -m 'Null-merge branch "maint"' maint
fi &&
git checkout $commit ANNOUNCE.rst &&
`git var GIT_EDITOR` ANNOUNCE.rst LATEST-CHANGES.rst docs/news.rst Cheetah/Version.py README.rst setup.cfg SetupConfig.py &&
exec git commit --message="Build: Prepare for the next release" --message="[skip ci]" ANNOUNCE.rst LATEST-CHANGES.rst docs/news.rst Cheetah/Version.py README.rst setup.cfg SetupConfig.py
|