@matheusbsbs / matheus-bagliano / commits / 0f0fc5783b
Fork 0

Make sure master <= naster <= pu, and avoid duplicate builds.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jan 14, 2006 at 18:17 UTC 0f0fc5783b1620033c10b7747a2359ce3ac62978
1 file changed +31 -9
Doit
+31 -9
@@ -6,22 +6,44 @@ test -z "$(git diff --cached --name-status)" || {
6 echo >&2 "Repository unclean."
7 exit 1
8 }
9 +Meta/Make clean >/dev/null 2>&1
10 +
11 +branches='naster master maint'
12 +
13 +# Make sure naster is between master and pu if exists
14 +if naster=`git rev-parse --verify refs/heads/naster 2>/dev/null`
15 +then
16 + master=`git rev-parse --verify refs/heads/master` &&
17 + pu=`git rev-parse --verify refs/heads/pu` &&
18 + MBM=`git merge-base --all $naster $master` &&
19 + MBN=`git merge-base --all $naster $pu` &&
20 + case ",$MBM,$MBN," in
21 + ",$master,$naster,") ;;
22 + *) echo >&2 "naster is not between master and pu"
23 + exit 1 ;;
24 + esac
25 + # If naster is the same as pu, no point rebuilding pu.
26 + case ",$naster,$pu," in
27 + ",$pu,$naster,") ;;
28 + *) branches="$branches pu" ;;
29 + esac
30 +fi
31
32 nstall=install
11 -for branch in naster master maint pu
33 +for branch in $branches
34 do
13 - rm -f ./:$branch.log &&
35 if git rev-parse --verify refs/heads/$branch 2>/dev/null
36 then
37 echo "* $branch" &&
17 - git checkout $branch || break
18 - {
19 - Meta/Make $J $nstall &&
20 - Meta/Make test &&
21 - Meta/Make clean
22 - } >./:$branch.log &&
38 + git checkout $branch &&
39 + Meta/Make $J all &&
40 + Meta/Make $J $nstall &&
41 + Meta/Make test &&
42 + Meta/Make clean &&
43 nstall=all || exit $?
44 else
45 echo "* No $branch"
46 fi
27 -done
47 +done >./:all.log 2>&1
48 +
49 +