This is the mail archive of the
archer@sourceware.org
mailing list for the Archer project.
RE: [Archer] RE: [Archer] Re: Apologies for wrong commit error
- From: "Pierre Muller" <pierre dot muller at ics-cnrs dot unistra dot fr>
- To: "'Joel Brobecker'" <brobecker at adacore dot com>
- Cc: "'Jan Kratochvil'" <jan dot kratochvil at redhat dot com>, <archer at sourceware dot org>
- Date: Sun, 20 Mar 2011 13:39:33 +0100
- Subject: RE: [Archer] RE: [Archer] Re: Apologies for wrong commit error
- 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>
> -----Message d'origine-----
> De?: Joel Brobecker [mailto:brobecker@adacore.com]
> Envoyé?: dimanche 20 mars 2011 05:48
> À?: Pierre Muller
> Cc?: 'Jan Kratochvil'; archer@sourceware.org
> Objet?: Re: [Archer] RE: [Archer] Re: Apologies for wrong commit error
>
> > 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'
>
> Ah, my bad. I had hoped that --force would have allowed us force
> the push.
>
> > Thus my error is written in stone forever :(
>
> 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
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
should push everything to origin/archer-muller-windows-multi
A while later, I just did this change in config, from
[branch "archer-muller-windows-multi"]
remote = origin
merge = refs/heads/archer-muller-windows-multi
push = refs/heads/archer-muller-windows-multi
to
[branch "archer-muller-windows-multi"]
remote = origin
merge = refs/heads/master
push = refs/heads/archer-muller-windows-multi
(OK, this is a mistake, but I really didn't expect
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 = origin
merge = refs/heads/archer-muller-windows-multi
Here
make push
never updated origin/archer-muller-windows-multi
Kind of illogical, no?
Pierre