From: Jeff King <peff@peff.net>
To: Martin Fick <mfick@codeaurora.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Interleaved remote branch update problems
Date: Thu, 5 Apr 2012 20:37:10 -0400 [thread overview]
Message-ID: <20120406003710.GC14224@sigill.intra.peff.net> (raw)
In-Reply-To: <201204051549.14397.mfick@codeaurora.org>
On Thu, Apr 05, 2012 at 03:49:14PM -0600, Martin Fick wrote:
> I have noticed that git push --force does not reliably force
> a push to remote branches. In particular, it will not
> update a remote branch if that branch has been updated since
> the beginning of the push. Is this normal, is this
> expected?
Yes, that's expected. --force means "it's OK to push something that will
rewind history", not "it's OK to clobber somebody else who is pushing at
the same time". The determination for the former happens on the client
side, and for the latter on the server side.
If you want the latter, you would need a protocol extension, I think;
I'm pretty sure the client doesn't transmit the force flag at all to the
server (and I don't think this should be tied to the force flag
automatically; they are two different cases, and you may be in a
situation where it is safe to do the former but not necessarily the
latter).
-Peff
next prev parent reply other threads:[~2012-04-06 0:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-05 21:49 Interleaved remote branch update problems Martin Fick
2012-04-06 0:37 ` Jeff King [this message]
2012-04-06 5:32 ` Martin Fick
2012-04-06 6:09 ` Jeff King
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=20120406003710.GC14224@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=mfick@codeaurora.org \
/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 NNTP newsgroup(s).