X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Doit;h=a9f91a6e9c6565d0e9285d2c450dd8bcde189089;hb=df5cc80ec929c9a10b6e71e4f10b3c6085d67b23;hp=705e8c4b0c2171286f85b12b9f95c6baecb53920;hpb=98e455ea2262a4e935498560d0483b019b54c523;p=git.git

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
+