git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Scott Sandler <scott.m.sandler@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Git push race condition?
Date: Mon, 24 Mar 2014 20:44:21 +0100	[thread overview]
Message-ID: <vpq61n3bcve.fsf@anie.imag.fr> (raw)
In-Reply-To: <CAAyEjTN53+5B9Od9wW698wODNL3hR6Upot8-ZLwEksn3ir_zjA@mail.gmail.com> (Scott Sandler's message of "Mon, 24 Mar 2014 15:18:14 -0400")

Scott Sandler <scott.m.sandler@gmail.com> writes:

> Both pushes are
> determined to be fast-forwards and both succeed, but B' overwrites B
> and B is no longer on origin/master. The server does have B in its
> .git directory but the commit isn't on any branch.

Is the reflog enabled on the server? If so, does it say anything about B
and B'?

What filesystem do you use on the server? Is there any kind of NFS, and
if so are you sure that there's only one machine accessing the
filesystem at the same time?

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

  reply	other threads:[~2014-03-24 19:44 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-24 19:18 Git push race condition? Scott Sandler
2014-03-24 19:44 ` Matthieu Moy [this message]
2014-03-24 20:01   ` Scott Sandler
2014-03-24 22:09     ` Matthieu Moy
2014-03-24 22:44       ` Junio C Hamano
2014-03-24 21:16 ` Ævar Arnfjörð Bjarmason
2014-03-24 21:29   ` Scott Sandler
2014-03-24 22:51   ` Jeff King
2014-03-24 22:54 ` Jeff King
2014-03-24 22:59   ` Nasser Grainawi
2014-03-25 13:45     ` Scott Sandler
2014-03-25 14:03       ` Matthieu Moy
2014-03-25 14:16         ` Scott Sandler
2014-03-25 14:22           ` Matthieu Moy
2014-03-25 14:57       ` Jeff King
2014-04-10 19:14         ` Scott Sandler
2014-04-11  7:46           ` Matthieu Moy

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=vpq61n3bcve.fsf@anie.imag.fr \
    --to=matthieu.moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=scott.m.sandler@gmail.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 NNTP newsgroup(s).