Dan Nicholson wrote:
On Tue, Feb 17, 2009 at 5:02 PM, Ian Romanick <[email protected]> wrote:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Dan Nicholson wrote:
On Mon, Feb 16, 2009 at 11:15 AM, Ian Romanick <[email protected]> wrote:
Brian Rogers wrote:
Here are a few patches that do things I found useful.
1. Specify -p to run 'git pull' on each component before building it.
NAK. You really want 'git fetch ; git rebase origin/<current branch>'.
git-pull really is the wrong thing to do here! I have a separate
script that does this for everything in the tree. The function that
does the fetch / rebase is:
I don't know what version of git this showed up in, but you can just
run "git pull --rebase" so it runs rebase instead of merge. So, you
could probably just use that.
That works just like "git fetch ; git rebase origin/<current branch>"?
I learn something new every day...
I'd like to push Brian's patches so they don't bitrot. If I "s/git
pull/& --rebase/", is that good? Brian, do you have a problem with
that?
I'm fine with that. In fact, I have such a patch ready that's already
been rebased to compensate for the other patch going in first.
>From b5cb314d97cce97a2f748cdb442a3a554b27298d Mon Sep 17 00:00:00 2001
From: Brian Rogers <[email protected]>
Date: Sun, 1 Feb 2009 02:47:39 -0800
Subject: [PATCH] Add support for pulling each component before building it.
---
build.sh | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/build.sh b/build.sh
index 2413036..fbaff6e 100755
--- a/build.sh
+++ b/build.sh
@@ -117,6 +117,10 @@ build() {
old_pwd=`pwd`
cd $SRCDIR || failed cd1 $1 $2
+ if test x"$PULL" = x1; then
+ git pull --rebase || failed "git pull" $1 $2
+ fi
+
# Build outside source directory
if [ "x$DIR_ARCH" != x ] ; then
mkdir -p "$DIR_ARCH" || failed mkdir $1 $2
@@ -623,6 +627,7 @@ usage() {
echo " -g : build with debug information"
echo " -n : do not quit after error; just print error message"
echo " -o module/component : build just this component"
+ echo " -p : run git pull on each component"
echo " -r module/component : resume building with this comonent"
echo " -s sudo-command : sudo command to use"
}
@@ -668,6 +673,9 @@ do
RESUME=$1
BUILD_ONE=1
;;
+ -p)
+ PULL=1
+ ;;
-r)
shift
RESUME=$1
--
1.6.0.4
_______________________________________________
xorg-devel mailing list
[email protected]
http://lists.x.org/mailman/listinfo/xorg-devel
