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>
Subject: RE: [Archer] RE: [Archer] Re: Apologies for wrong commit error
Date: Sun, 20 Mar 2011 12:40:00 -0000 [thread overview]
Message-ID: <002301cbe6fb$f6b2e4d0$e418ae70$@muller@ics-cnrs.unistra.fr> (raw)
In-Reply-To: <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
next prev parent reply other threads:[~2011-03-20 12:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-19 21:35 Pierre Muller
2011-03-19 21:46 ` Jan Kratochvil
2011-03-19 23:31 ` [Archer] " Joel Brobecker
2011-03-19 23:47 ` Pierre Muller
2011-03-20 4:48 ` [Archer] " Joel Brobecker
2011-03-20 12:40 ` Pierre Muller [this message]
2011-03-19 23:40 ` Pierre Muller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='002301cbe6fb$f6b2e4d0$e418ae70$@muller@ics-cnrs.unistra.fr' \
--to=pierre.muller@ics-cnrs.unistra.fr \
--cc=archer@sourceware.org \
--cc=brobecker@adacore.com \
--cc=jan.kratochvil@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).