From: Junio C Hamano <junkio@cox.net>
Date: Thu, 9 Feb 2006 06:08:30 +0000 (-0800)
Subject: Introduce an easier to follow "next" branch.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=df5cc80ec929c9a10b6e71e4f10b3c6085d67b23;p=git.git

Introduce an easier to follow "next" branch.

The "pu" branch is a bit too hard to follow.  Let's introduce
"next" branch, which is slightly ahead of "master".  The topic
branches merged into it are not to be rebased, and changes to
the topic branches are first applied to them and then merged
into the "next" branch.  What this means is that the branch is
far easier to follow compared to the "pu" branch since there
will be no rewinding/rebasing involved.
---

diff --git a/DoKernelOrg b/DoKernelOrg
index c8fc0205..93426523 100755
--- a/DoKernelOrg
+++ b/DoKernelOrg
@@ -14,47 +14,26 @@ make clean >/dev/null 2>&1 &&
 case "$1" in
 '')
 	echo "* Building all"
-	branches='naster master maint'
-
-	# Make sure naster is between master and pu if exists
-	if naster=`git rev-parse --verify refs/heads/naster 2>/dev/null`
-	then
-		master=`git rev-parse --verify refs/heads/master` &&
-		pu=`git rev-parse --verify refs/heads/pu` &&
-		MBM=`git merge-base --all $naster $master` &&
-		MBN=`git merge-base --all $naster $pu` &&
-		case ",$MBM,$MBN," in
-		",$master,$naster,") ;;
-		*)	echo >&2 "naster is not between master and pu"
-			exit 1 ;;
-		esac
-		# If naster is the same as pu, no point rebuilding pu.
-		case ",$naster,$pu," in
-		",$pu,$naster,") ;;
-		*) branches="$branches pu" ;;
-		esac
-	fi
-
-	{
-		nstalled=install
-		for branch in $branches
-		do
-			if git-rev-parse --verify refs/heads/$branch 2>/dev/null
-			then
-				echo "** $branch **" &&
-				git checkout $branch &&
-				make $J $nstalled &&
-				make test &&
-				make clean &&
-				nstalled=all || exit $?
-			else
-				echo
-				echo "* NO $branch"
-				echo
-			fi
-		done
-	} >:all.log 2>&1
+	branches='next master maint'
+	nstalled=install
+	for branch in $branches
+	do
+		if git-rev-parse --verify refs/heads/$branch 2>/dev/null
+		then
+			echo "** $branch **" &&
+			git checkout $branch &&
+			make $J $nstalled &&
+			make test &&
+			make clean &&
+			nstalled=all || exit $?
+		else
+			echo
+			echo "* NO $branch"
+			echo
+		fi
+	done >:all.log 2>&1
 	;;
+
 maint | master)
 	arch=x86_64
 	mkdir -p $G/RPMS/$arch $G/RPMS/SRPMS &&
diff --git a/Doit b/Doit
index 705e8c4b..a9f91a6e 100755
--- a/Doit
+++ b/Doit
@@ -8,26 +8,7 @@ test -z "$(git diff --cached --name-status)" || {
 }
 Meta/Make clean >/dev/null 2>&1
 
-branches='naster master maint'
-
-# Make sure naster is between master and pu if exists
-if naster=`git rev-parse --verify refs/heads/naster 2>/dev/null`
-then
-	master=`git rev-parse --verify refs/heads/master` &&
-	pu=`git rev-parse --verify refs/heads/pu` &&
-	MBM=`git merge-base --all $naster $master` &&
-	MBN=`git merge-base --all $naster $pu` &&
-	case ",$MBM,$MBN," in
-	",$master,$naster,") ;;
-	*)	echo >&2 "naster is not between master and pu"
-		exit 1 ;;
-	esac
-	# If naster is the same as pu, no point rebuilding pu.
-	case ",$naster,$pu," in
-	",$pu,$naster,") ;;
-	*) branches="$branches pu" ;;
-	esac
-fi
+branches='next master maint'
 
 nstall=install
 for branch in $branches
@@ -46,4 +27,6 @@ do
 	fi
 done >./:all.log 2>&1
 
+git checkout master
+