Replace 'devel' with 'master'

dscho · dscho · commit 6bf64a435430 · 2012-11-30T13:26:38.000-06:00
As discussed on the msysGit mailing list, we switched from the
two-integration branch workflow to a single one.

The original idea of having 'devel' and 'master' as two separate
integration branches was to let 'devel' be rebased all the time while
'master' *must* fast-forward always.

However, it turned out that such a maintainership style falls on its face
when there are more than a single maintainer, so we had to invent the
merging rebase strategy: it allows us to rebase but fast-forward at the
same time. It does so by faking a merge when going back to a clean
upstream revision and re-applying all the patches.

Since that distinction between 'devel' and 'master' is now obsolete, we
can just do away with 'devel'. It has served us well and deserves to be
retired now. May it rest in peace.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/share/WinGit/HowToRelease.txt b/share/WinGit/HowToRelease.txt
@@ -43,7 +43,7 @@ Here is a step-by-step instruction for the maintainer:
    cd /git
    git fetch mingw
    git fetch junio
-   git checkout devel
+   git checkout master
    git merge mingw/master
    git merge junio/master
    make -k test | tee test.log
@@ -59,7 +59,7 @@ Here is a step-by-step instruction for the maintainer:
    git merge origin/master
 
    cd /share/WinGit
-   git checkout devel
+   git checkout master
    start ReleaseNotes.rtf # edit and save
    git commit -a
    git tag -a -m "Git-<version>" Git-<version>
@@ -70,12 +70,10 @@ Here is a step-by-step instruction for the maintainer:
    # Upload to Google code (verify sha1).
 
    cd /git
-   git push . devel:master  # should fast-forward
-   git push
+   git push master
    git push <version>-msysgit<number>
    cd /
-   git push . devel:master
-   git push
+   git push master
    git push Git-<version>
    # Don't forget to push tags.
 
diff --git a/share/msysGit/merging-rebase.sh b/share/msysGit/merging-rebase.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Rebase 'devel' on top of an upstream branch (defaults to 'junio/next'),
+# Rebase 'master' on top of an upstream branch (defaults to 'junio/next'),
 # retaining "fast-forwardability" by "merging" (with the "ours" strategy) the
 # previous state on top of the current upstream state.
 #
diff --git 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=devel
+test -z "$MSYSGITBRANCH" && MSYSGITBRANCH=master
 FOURMSYSGITBRANCH="$3"
 
 TARGET="$HOME"/msysGit-netinstall-"$1".exe
diff --git a/share/msysGit/net/setup-msysgit.sh b/share/msysGit/net/setup-msysgit.sh
@@ -124,7 +124,7 @@ git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*' &&
 git fetch --tags origin &&
 if test -z "@@FOURMSYSGITBRANCH@@"
 then
-	FOURMSYS=origin/devel
+	FOURMSYS=origin/master
 else
 	FOURMSYS=origin/@@FOURMSYSGITBRANCH@@
 fi &&
diff --git a/share/msysGit/rebasing-merge.sh b/share/msysGit/rebasing-merge.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# Rebase 'devel' on top of an upstream branch (defaults to 'junio/next').
-# This merges the old state of 'devel' using the merge strategy 'ours'
+# Rebase 'master' on top of an upstream branch (defaults to 'junio/next').
+# This merges the old state of 'master' using the merge strategy 'ours'
 # to enable a fast-forward.
 #
 # options:
@@ -58,20 +58,20 @@ fi
 TODO_EXTRA="$(git rev-parse --git-dir)/todo-extra"
 
 case "$(git rev-parse --symbolic-full-name HEAD)" in
-refs/heads/devel)
+refs/heads/master)
 	UPSTREAM=$(git rev-parse --symbolic-full-name HEAD@{u}) || {
 		echo "Not tracking any remote branch!" >&2
 		exit 1
 	}
 	test "$(git rev-parse HEAD)" = "$(git rev-parse $UPSTREAM)" ||
-	test "$(git rev-parse devel@{1})" = "$(git rev-parse $UPSTREAM)" || {
-		echo "Your 'devel' is not up-to-date!" >&2
+	test "$(git rev-parse master@{1})" = "$(git rev-parse $UPSTREAM)" || {
+		echo "Your 'master' is not up-to-date!" >&2
 		exit 1
 	}
 	;; # okay
 HEAD) ;; # okay
 *)
-	echo "Not on 'devel'!" >&2
+	echo "Not on 'master'!" >&2
 	exit 1
 	;;
 esac

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`	`#`
`3`		`-# Rebase 'devel' on top of an upstream branch (defaults to 'junio/next'),`
	`3`	`+# Rebase 'master' on top of an upstream branch (defaults to 'junio/next'),`
`4`	`4`	`# retaining "fast-forwardability" by "merging" (with the "ours" strategy) the`
`5`	`5`	`# previous state on top of the current upstream state.`
`6`	`6`	`#`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ test -z "$1" && {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`MSYSGITBRANCH="$2"`
`11`		`-test -z "$MSYSGITBRANCH" && MSYSGITBRANCH=devel`
	`11`	`+test -z "$MSYSGITBRANCH" && MSYSGITBRANCH=master`
`12`	`12`	`FOURMSYSGITBRANCH="$3"`
`13`	`13`
`14`	`14`	`TARGET="$HOME"/msysGit-netinstall-"$1".exe`