[PATCH] A few build.sh features

[Dan Nicholson]

On Mon, Feb 16, 2009 at 11:15 AM, Ian Romanick <idr at freedesktop.org> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> 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.

On the other hand, I suspect that most people using build.sh are
people that are just trying to keep up with xorg git and don't have
patches that they're trying to keep on top of master. In that case, a
simple pull would probably be fine for build.sh. I think anyone
developing X probably has their own build setup not using build.sh.

--
Dan