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

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.

Junio C Hamano committed Feb 8, 2006 at 22:08 UTC df5cc80ec929c9a10b6e71e4f10b3c6085d67b23
2 files changed +22 -60
DoKernelOrg
+19 -40
@@ -14,47 +14,26 @@ make clean >/dev/null 2>&1 &&
14 case "$1" in
15 '')
16 echo "* Building all"
17 - branches='naster master maint'
18 -
19 - # Make sure naster is between master and pu if exists
20 - if naster=`git rev-parse --verify refs/heads/naster 2>/dev/null`
21 - then
22 - master=`git rev-parse --verify refs/heads/master` &&
23 - pu=`git rev-parse --verify refs/heads/pu` &&
24 - MBM=`git merge-base --all $naster $master` &&
25 - MBN=`git merge-base --all $naster $pu` &&
26 - case ",$MBM,$MBN," in
27 - ",$master,$naster,") ;;
28 - *) echo >&2 "naster is not between master and pu"
29 - exit 1 ;;
30 - esac
31 - # If naster is the same as pu, no point rebuilding pu.
32 - case ",$naster,$pu," in
33 - ",$pu,$naster,") ;;
34 - *) branches="$branches pu" ;;
35 - esac
36 - fi
37 -
38 - {
39 - nstalled=install
40 - for branch in $branches
41 - do
42 - if git-rev-parse --verify refs/heads/$branch 2>/dev/null
43 - then
44 - echo "** $branch **" &&
45 - git checkout $branch &&
46 - make $J $nstalled &&
47 - make test &&
48 - make clean &&
49 - nstalled=all || exit $?
50 - else
51 - echo
52 - echo "* NO $branch"
53 - echo
54 - fi
55 - done
56 - } >:all.log 2>&1
17 + branches='next master maint'
18 + nstalled=install
19 + for branch in $branches
20 + do
21 + if git-rev-parse --verify refs/heads/$branch 2>/dev/null
22 + then
23 + echo "** $branch **" &&
24 + git checkout $branch &&
25 + make $J $nstalled &&
26 + make test &&
27 + make clean &&
28 + nstalled=all || exit $?
29 + else
30 + echo
31 + echo "* NO $branch"
32 + echo
33 + fi
34 + done >:all.log 2>&1
35 ;;
36 +
37 maint | master)
38 arch=x86_64
39 mkdir -p $G/RPMS/$arch $G/RPMS/SRPMS &&
Doit
+3 -20
@@ -8,26 +8,7 @@ test -z "$(git diff --cached --name-status)" || {
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
11 +branches='next master maint'
12
13 nstall=install
14 for branch in $branches
@@ -46,4 +27,6 @@ do
27 fi
28 done >./:all.log 2>&1
29
30 +git checkout master
31 +
32