From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <archer-return-2417-listarch-archer=sourceware.org@sourceware.org>
Received: (qmail 3249 invoked by alias); 20 Mar 2011 12:40:58 -0000
Mailing-List: contact archer-help@sourceware.org; run by ezmlm
Sender: <archer@sourceware.org>
Precedence: bulk
List-Post: <mailto:archer@sourceware.org>
List-Help: <mailto:archer-help@sourceware.org>
List-Subscribe: <mailto:archer-subscribe@sourceware.org>
List-Id: <archer.sourceware.org>
Received: (qmail 3240 invoked by uid 22791); 20 Mar 2011 12:40:57 -0000
X-SWARE-Spam-Status: No, hits=-1.2 required=5.0
	tests=AWL,BAYES_00,MSGID_MULTIPLE_AT
X-Spam-Check-By: sourceware.org
From: "Pierre Muller" <pierre.muller@ics-cnrs.unistra.fr>
To: "'Joel Brobecker'" <brobecker@adacore.com>
Cc: "'Jan Kratochvil'" <jan.kratochvil@redhat.com>, <archer@sourceware.org>
References: <006b01cbe67d$7f308da0$7d91a8e0$@muller@ics-cnrs.unistra.fr> <20110319214549.GA4744@host1.jankratochvil.net> <20110319233114.GD2534@adacore.com> <007401cbe68f$e7158490$b5408db0$@muller@ics-cnrs.unistra.fr> <20110320044756.GE2534@adacore.com>
In-Reply-To: <20110320044756.GE2534@adacore.com>
Subject: RE: [Archer] RE: [Archer] Re: Apologies for wrong commit error
Date: Sun, 20 Mar 2011 12:40:00 -0000
Message-ID: <002301cbe6fb$f6b2e4d0$e418ae70$@muller@ics-cnrs.unistra.fr>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
X-SW-Source: 2011-q1/txt/msg00135.txt.bz2



> -----Message d'origine-----
> De=A0: Joel Brobecker [mailto:brobecker@adacore.com]
> Envoy=E9=A0: dimanche 20 mars 2011 05:48
> =C0=A0: Pierre Muller
> Cc=A0: 'Jan Kratochvil'; archer@sourceware.org
> Objet=A0: Re: [Archer] RE: [Archer] Re: Apologies for wrong commit error
>=20
> >  As expected in my previous email, this is not possible:
> >
> > Pierre@E6510-Muller ~/git/archer
> > $ git push  --force origin master
> > Total 0 (delta 0), reused 0 (delta 0)
> > remote: error: denying non-fast-forward refs/heads/master (you should
> pull
> > first
> > )
> > To ssh://sourceware.org/git/archer.git
> >  ! [remote rejected] master -> master (non-fast-forward)
> > error: failed to push some refs to
> 'ssh://sourceware.org/git/archer.git'
>=20
> Ah, my bad.  I had hoped that --force would have allowed us force
> the push.
>=20
> >   Thus my error is written in stone forever :(
>=20
> Just like it would have been with any other version control system.
> We all do our best, and in the end, if the error is corrected,
> I don't think it's an issue all.

  The worst part is that I almost didn't notice that the patch went to the
wrong=20
branch on repository.
  I tried hard to find a way to have a local branch with a short name
like wmulti instead of archer-muller-windows-multi because
I am lazy as most people are.

  I could find no way to tell to git program
that a simple
git push=20
should push everything to origin/archer-muller-windows-multi

  A while later, I just did this change in config, from=20
[branch "archer-muller-windows-multi"]
        remote =3D origin
        merge =3D refs/heads/archer-muller-windows-multi
        push =3D refs/heads/archer-muller-windows-multi

to=20
[branch "archer-muller-windows-multi"]
        remote =3D origin
        merge =3D refs/heads/master
        push =3D refs/heads/archer-muller-windows-multi
(OK, this is a mistake, but I really didn't expect=20
such a consequence...)
and used a simple
make push
to discover that commit was sent to origin/master instead of
origin/archer-muller-windows-multi

  Which makes me wonder why it did not work when I tried
[branch "wmulti"]
        remote =3D origin
        merge =3D refs/heads/archer-muller-windows-multi
Here
make push=20
never updated origin/archer-muller-windows-multi

  Kind of illogical, no?

Pierre
=20=20