From e438f0ce7068e7af2c1f82e72607eceb09d4f17d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 24 Mar 2010 10:10:56 +0100
Subject: [PATCH 1/2] Switch to using branch for STABLE/TESTING.

---
 scripts/create-release.sh | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 9e5b0a166..10ec3d998 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -29,6 +29,24 @@ then
 fi
 
 
+# Checks whether remote branch has local tracking branch
+ensure_local_branch() {
+    if ! git branch | grep -q '^..'"$1"'$' ; then
+        git branch --track $1 origin/$1
+    fi
+}
+
+# Marks current head of given branch as head of other branch
+# Used for STABLE/TESTING tracking
+mark_as_release() {
+    branch=$1
+    rel_branch=$2
+    echo "* Marking release as $rel_branch"
+    ensure_local_branch $rel_branch
+    git checkout $rel_branch
+    git merge $branch
+}
+
 # Read required parameters
 version=$1
 shift
@@ -58,6 +76,7 @@ if [ "$do_release" != 'y' ]; then
 fi
 
 # Checkout branch
+ensure_local_branch $branch
 git checkout $branch
 
 # Check release version
@@ -179,11 +198,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
-                    echo "* Tagging release as TESTING"
-                    git tag -a -f -m "Released $version" TESTING $branch
+                    mark_as_release $brach TESTING
                 else
-                    echo "* Tagging release as STABLE"
-                    git tag -a -f -m "Released $version" STABLE $branch
+                    # 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
                 fi
                 echo "   Dont forget to push tags using: git push --tags"
                 ;;
@@ -202,7 +222,7 @@ cat <<END
 Todo now:
 ---------
 
-1. If not already done, tag the repository with the new revision number 
+1. If not already done, tag the repository with the new revision number
    for a plain release or a release candidate:
     version 2.7.0 gets two tags: RELEASE_2_7_0 and STABLE
     version 2.7.1-rc1 gets RELEASE_2_7_1RC1 and TESTING

From f9e1592958310191f97def4306d27f695de40245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 24 Mar 2010 10:25:56 +0100
Subject: [PATCH 2/2] 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"
                 ;;