public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox•com>
To: Felipe Contreras <felipe.contreras@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 0/5] transport-helper: serious crash fix
Date: Tue, 15 Apr 2014 14:28:13 -0700	[thread overview]
Message-ID: <xmqqbnw2jn9u.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1397334812-12215-1-git-send-email-felipe.contreras@gmail.com> (Felipe Contreras's message of "Sat, 12 Apr 2014 15:33:27 -0500")

Felipe Contreras <felipe.contreras@gmail•com> writes:

> One of the most serious recurring issues[1][2][3] with remote helpers is that
> marks get out of sync. The way to analize and reproduce these wasn't trivial,
> but the culprit seems to be a crash while doing `git push`. It has been known
> already how exactly that happens, but no simple way how to fix it.
>
> This is the simplest way so far; tell `git fast-export` to export the marks to
> a temporary file, and move it to the right location only *after* the remote
> helper has finished its job without errors.
>
> Since the code wasn't prepared for a change like this, some reorganization
> changes are needed. More changes might be welcome to further propagate the
> errors properly through the code, but for the moment the errors are propagated
> to the right location, in order to fix this specific problem.

This seems to be based on a somewhat older codebase; I tried to be
careful while adjusting the patch to the current codebase, but
please give it an eyeball to see if I didn't make any silly mistake
in the version that has been parked on 'pu'.

After an positive Ack (or "you botched the forward-porting; here is
a rebased one you should replace them with"), I'd like to merge it
to 'next' and then to 'master' by -rc0 (or -rc1 at the latest) so
that we have enough time to expose the updated code before 2.0.

Thanks.

  parent reply	other threads:[~2014-04-15 21:28 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-12 20:33 [PATCH 0/5] transport-helper: serious crash fix Felipe Contreras
2014-04-12 20:33 ` [PATCH 1/5] transport-helper: remove barely used xchgline() Felipe Contreras
2014-04-12 20:33 ` [PATCH 2/5] remote-helpers: make recvline return an error Felipe Contreras
2014-04-12 20:33 ` [PATCH 3/5] transport-helper: propagate recvline() error pushing Felipe Contreras
2014-04-12 20:33 ` [PATCH 4/5] transport-helper: trivial cleanup Felipe Contreras
2014-04-14 21:14   ` Junio C Hamano
2014-04-12 20:33 ` [PATCH 5/5] transport-helper: fix sync issue on crashes Felipe Contreras
2014-04-14 21:25   ` Junio C Hamano
2014-04-15 21:28 ` Junio C Hamano [this message]
2014-04-19  7:00 ` [PATCH 0/5] fc/transport-helper-sync-error-fix rebased Junio C Hamano
2014-04-19  7:00   ` [PATCH 1/5] transport-helper: remove barely used xchgline() Junio C Hamano
2014-04-19  7:00   ` [PATCH 2/5] remote-helpers: make recvline return an error Junio C Hamano
2014-04-19  7:00   ` [PATCH 3/5] transport-helper: propagate recvline() error pushing Junio C Hamano
2014-04-19  7:00   ` [PATCH 4/5] transport-helper: trivial cleanup Junio C Hamano
2014-04-19  7:00   ` [PATCH 5/5] transport-helper: fix sync issue on crashes Junio C Hamano
2014-04-20 18:36   ` [PATCH 0/5] fc/transport-helper-sync-error-fix rebased Felipe Contreras
2014-04-20 21:10     ` Junio C Hamano
2014-04-20 21:12       ` Felipe Contreras
2014-04-20 21:52         ` Junio C Hamano
2014-04-20 21:54           ` Felipe Contreras

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=xmqqbnw2jn9u.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=felipe.contreras@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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