From f9e1592958310191f97def4306d27f695de40245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 24 Mar 2010 10:25:56 +0100 Subject: [PATCH] Avoid messing up with working copy more than needed. --- scripts/create-release.sh | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 10ec3d998..22dfa88a9 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -75,6 +75,19 @@ if [ "$do_release" != 'y' ]; then exit 100 fi +# Ensure we have tracking branch +ensure_local_branch $branch + +# Create working copy +mkdir -p release +workdir=release/phpMyAdmin-$version +if [ -d $workdir ] ; then + echo "Working directory '$workdir' already exists, please move it out of way" + exit 1 +fi +git clone --local . $workdir +cd $workdir + # Checkout branch ensure_local_branch $branch git checkout $branch @@ -97,16 +110,6 @@ if ! grep -q "Version $version\$" README ; then exit 2 fi -# Create working copy -mkdir -p release -workdir=release/phpMyAdmin-$version -if [ -d $workdir ] ; then - echo "Working directory '$workdir' already exists, please move it out of way" - exit 1 -fi -git clone --local . $workdir -cd $workdir - # Cleanup release dir LC_ALL=C date -u > RELEASE-DATE-${version} @@ -198,12 +201,12 @@ if [ $# -gt 0 ] ; then echo "* Tagging release as $tagname" git tag -a -m "Released $version" $tagname $branch if echo $version | grep '[a-z_-]' ; then - mark_as_release $brach TESTING + mark_as_release $branch TESTING else # We update both branches here # As it does not make sense to have older testing than stable - mark_as_release $brach TESTING - mark_as_release $brach STABLE + mark_as_release $branch TESTING + mark_as_release $branch STABLE fi echo " Dont forget to push tags using: git push --tags" ;;