From 6bf64a43543014be9f055abcf291b46a28272851 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 30 Nov 2012 13:26:35 -0600 Subject: [PATCH] Replace 'devel' with 'master' 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 --- share/WinGit/HowToRelease.txt | 10 ++++------ share/msysGit/merging-rebase.sh | 2 +- share/msysGit/net/release.sh | 2 +- share/msysGit/net/setup-msysgit.sh | 2 +- share/msysGit/rebasing-merge.sh | 12 ++++++------ 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/share/WinGit/HowToRelease.txt b/share/WinGit/HowToRelease.txt index 32753151..c5439d51 100644 --- 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-" Git- @@ -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 -msysgit cd / - git push . devel:master - git push + git push master git push Git- # Don't forget to push tags. diff --git a/share/msysGit/merging-rebase.sh b/share/msysGit/merging-rebase.sh index 58cc9819..a0071b5e 100755 --- 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 index 434ff4b2..f77cb948 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=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 index cd6a8eb7..f287e631 100644 --- 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 index c8636987..a000f6dc 100755 --- 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 -- 2.11.4.GIT