X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Doit;h=49b3ebe37ede60546d59430db23381d1e2695931;hb=a32d80295581365b318e88fc657e25c9acb75bd1;hp=5e14c7c169c70c72888c9c93c8e1d217cbf0048f;hpb=0f0fc5783b1620033c10b7747a2359ce3ac62978;p=git.git

diff --git a/Doit b/Doit
index 5e14c7c1..49b3ebe3 100755
--- a/Doit
+++ b/Doit
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-J='-l 2.5 -j'
+: ${J=-j2}
 
 test -z "$(git diff --cached --name-status)" || {
 	echo >&2 "Repository unclean."
@@ -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 pu'}
 
 nstall=install
 for branch in $branches
@@ -39,11 +20,12 @@ do
 		Meta/Make $J all &&
 		Meta/Make $J $nstall &&
 		Meta/Make test &&
-		Meta/Make clean &&
-		nstall=all || exit $?
+		Meta/Make clean || exit $?
 	else
 		echo "* No $branch"
 	fi
 done >./:all.log 2>&1
 
+git checkout master
+