There is no master branch. There is only prod. And dev.

But definitely no master.

svn path=/trunk/scripts/git-migration/; revision=2578

diff --git a/git-migrate-fast.sh b/git-migrate-fast.sh
index 7d6213f..35606fa 100755 (executable)
--- a/git-migrate-fast.sh
+++ b/git-migrate-fast.sh
@@ -18,7 +18,7 @@ mkdir git
 cd git
 
 sed -n 's/^create repository // p' ../rules | while read repo; do
-    mkdir -p "$repo" && GIT_DIR="$repo" git init --bare
+    mkdir -p "$repo" && GIT_DIR="$repo" git init --bare && GIT_DIR="$repo" git symbolic-ref HEAD refs/heads/prod
 done
 
 svn-all-fast-export --identity-map ../authors ../rules "$SVN"
@@ -60,12 +60,19 @@ popd
 pushd packages/python-routefs.git
 git fetch -t git://github.com/ebroder/python-routefs.git
 git branch -f upstream 1.0.1
-git branch -f master 1.0.1-1
+git branch -f prod 1.0.1-1
 popd
 
+for r in $(ls packages); do
+    pushd "packages/$r"
+    git branch dev prod
+    popd
+done
+
 mkdir packages.git
 pushd packages.git
 git init --bare
+git symbolic-ref HEAD refs/heads/prod
 (
     echo 'commit refs/heads/prod'
     echo 'mark :1'
@@ -75,7 +82,7 @@ git init --bare
     echo 'EOF'
     for r in $(ls ../packages); do
        pushd "../packages/$r" &>/dev/null
-       commit="$(git rev-parse refs/heads/master)"
+       commit="$(git rev-parse refs/heads/prod)"
        popd &>/dev/null
 
        echo "M 160000 $commit ${r%.git}"

diff --git a/rules.mako b/rules.mako
index 291d70c..e6bb325 100644 (file)
--- a/rules.mako
+++ b/rules.mako
@@ -26,7 +26,7 @@
             return packages[package]['branch']
         if 'merge' in packages[package]:
             return get_branch(packages[package]['merge'])
-        return 'master'
+        return 'prod'
 
     def get_tag_prefix(package):
         if 'merge' in packages[package]: