From 1257c126b9101784006502203dda52b84b523d21 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 7 Apr 2010 17:48:13 +0200
Subject: [PATCH] Point the net installer to the 'devel' branches

The net installer is meant to make contributing and testing easier, so it
is a bit pointless to let it check out the most-likely-obsolete 'master'
branches of msysgit.git and 4msysgit.git.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 share/msysGit/net/release.sh       |  2 +-
 share/msysGit/net/setup-msysgit.sh | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/share/msysGit/net/release.sh b/share/msysGit/net/release.sh
index 6cd71904..b93e8993 100644
--- a/share/msysGit/net/release.sh
+++ b/share/msysGit/net/release.sh
@@ -8,7 +8,7 @@ test -z "$1" && {
 }
 
 MSYSGITBRANCH="$2"
-test -z "$MSYSGITBRANCH" && MSYSGITBRANCH=master
+test -z "$MSYSGITBRANCH" && MSYSGITBRANCH=devel
 FOURMSYSGITBRANCH="$3"
 
 TARGET="$HOME"/msysGit-netinstall-"$1".exe
diff --git a/share/msysGit/net/setup-msysgit.sh b/share/msysGit/net/setup-msysgit.sh
index aeaa463d..299e066e 100644
--- a/share/msysGit/net/setup-msysgit.sh
+++ b/share/msysGit/net/setup-msysgit.sh
@@ -53,11 +53,11 @@ git config core.autocrlf false &&
 git config remote.origin.url $MSYSGIT_REPO_GIT &&
 git config remote.origin.fetch \
 	+refs/heads/@@MSYSGITBRANCH@@:refs/remotes/origin/@@MSYSGITBRANCH@@ &&
-git config branch.master.remote origin &&
-git config branch.master.merge refs/heads/@@MSYSGITBRANCH@@ &&
+git config branch.@@MSYSGITBRANCH@@.remote origin &&
+git config branch.@@MSYSGITBRANCH@@.merge refs/heads/@@MSYSGITBRANCH@@ &&
 git config remote.mob.url $MSYSGIT_REPO_GIT_MOB &&
-git config remote.mob.fetch +refs/heads/mob:refs/remotes/origin/mob &&
-git config remote.mob.push master:mob &&
+git config remote.mob.fetch +refs/heads/@@MSYSGITBRANCH@@:refs/remotes/origin/mob &&
+git config remote.mob.push @@MSYSGITBRANCH@@:mob &&
 
 USE_HTTP=
 git fetch || {
@@ -77,10 +77,10 @@ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
 
 echo
 echo -------------------------------------------------------
-echo Checking out the master branch
+echo Checking out the @@MSYSGITBRANCH@@ branch
 echo -------------------------------------------------------
-git-checkout -l -f -q -b master origin/@@MSYSGITBRANCH@@ ||
-	error Couldn\'t checkout the master branch!
+git-checkout -l -f -q -b @@MSYSGITBRANCH@@ origin/@@MSYSGITBRANCH@@ ||
+	error Couldn\'t checkout the @@MSYSGITBRANCH@@ branch!
 mkdir -p .git/hooks &&
 cp share/msysGit/post-checkout-hook .git/hooks/post-checkout ||
 	error Could not install post-checkout hook
@@ -108,7 +108,7 @@ t)
 esac
 
 git config submodule.git.url $MINGW4MSYSGIT_REPO_URL &&
-mkdir git &&
+mkdir -p git &&
 cd git &&
 git init &&
 git config core.autocrlf input &&
@@ -123,12 +123,14 @@ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*' &&
 git fetch --tags origin &&
 if test -z "@@FOURMSYSGITBRANCH@@"
 then
-	FOURMSYS=$(cd .. && git ls-tree HEAD git |
-		sed -n "s/^160000 commit \(.*\)	git$/\1/p")
+	FOURMSYS=origin/devel
 else
 	FOURMSYS=origin/@@FOURMSYSGITBRANCH@@
 fi &&
-git checkout -l -f -q $FOURMSYS ||
+git config branch.${FOURMSYS#origin/}.remote origin &&
+git config branch.${FOURMSYS#origin/}.merge refs/heads/${FOURMSYS#origin/} &&
+git fetch origin &&
+git checkout -l -f -q -b ${FOURMSYS#origin/} $FOURMSYS ||
 error Couldn\'t update submodule git!
 
 echo
-- 
2.11.4.GIT