This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: Another contrib patch
- From: Paolo Bonzini <bonzini at gnu dot org>
- To: Tobias Burnus <burnus at net-b dot de>, repnop at gmail dot com, GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Wed, 02 Jun 2010 15:07:20 +0200
- Subject: Re: Another contrib patch
- References: <4BFBE17B.50601@redhat.com> <Pine.LNX.4.64.1005251554240.17783@digraph.polyomino.org.uk> <4BFBF618.7090706@redhat.com> <AANLkTinqjTOjrqjbaEANUeujdEpVfcXpdv_yBm5KuWxl@mail.gmail.com> <4BFEC1D3.3090209@redhat.com> <4C061F65.6000203@redhat.com> <4C0631B9.90905@gnu.org> <4C065503.5060009@net-b.de>
On 06/02/2010 02:56 PM, Tobias Burnus wrote:
Hi Paolo,
On 06/02/2010 12:26 PM, Paolo Bonzini wrote:
[...]
since you seemingly also review ./contrib/ patches... I recently saw the
following - still unreviewed - patch by Bernhard, which I like:
http://gcc.gnu.org/ml/gcc-patches/2010-05/msg01371.html
Re: [PATCH] gcc_update: support updating a git clone
Ok with one change. Here:
+ $GCC_GIT stash ${silent+-q}
+ $GCC_GIT pull ${silent+-q} --rebase ${1+"$@"}
+ ret=$?
+ $GCC_GIT stash ${silent+-q} pop
+ if [ $ret -ne 0 ]; then
change it to something like this:
$GCC_GIT diff -q HEAD || {
echo "updating dirty git tree, commit your changes and retry." >&2
exit 1
fi
$GCC_GIT pull ${silent+-q} --rebase ${1+"$@"}
if [ $? != 0 ]; then
Because if the rebase has failed and has conflict marks, chances are a
conflicting stash pop would mess up things even more. People should
just enjoy their distributed VCS instead.
Paolo