From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Paul Tan <pyokagan@gmail.com>,
Brendan Forster <shiftkey@github.com>,
Git List <git@vger.kernel.org>
Subject: Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails
Date: Mon, 12 Oct 2015 11:46:59 +0200 [thread overview]
Message-ID: <793ef29a6d9c77b4f4be478239b74089@dscho.org> (raw)
In-Reply-To: <xmqqzizroorx.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On 2015-10-09 20:55, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> I would prefer the endgame to be an efficient implementation of
> merge_recursive_generic(), a function that you can call without you
> having to worry about it dying.
>
> But the patch in this thread is not that, if I am reading Johannes's
> description correctly.
As pointed out by Paul, the recursive merge should only die() in case of a non-recoverable error so serious that not even rerere can do anything (such as a read error).
The bug is that a code path for a non-recoverable error is taken.
Spawning the recursive merge would be a work-around making the need to fix that bug less urgent, nothing more. (So would introducing the 'gentle' flag, of course, albeit without the performance regression of spawning a new process.)
Ciao,
Dscho
next prev parent reply other threads:[~2015-10-12 9:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-08 20:35 [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails Johannes Schindelin
2015-10-08 20:35 ` [PATCH 1/2] merge_recursive_options: introduce the "gentle" flag Johannes Schindelin
2015-10-08 20:35 ` [PATCH 2/2] pull --rebase: reinstate helpful message on abort Johannes Schindelin
2015-10-09 18:36 ` Junio C Hamano
2015-10-12 9:16 ` Johannes Schindelin
2015-10-12 20:33 ` Junio C Hamano
2015-10-09 0:52 ` [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails Junio C Hamano
2015-10-09 1:40 ` Paul Tan
2015-10-09 9:50 ` Johannes Schindelin
2015-10-09 10:11 ` Johannes Schindelin
2015-10-09 20:49 ` Junio C Hamano
2015-10-10 4:58 ` Torsten Bögershausen
2015-10-10 16:05 ` Torsten Bögershausen
2015-10-12 10:45 ` Johannes Schindelin
2015-10-09 18:15 ` Junio C Hamano
2015-10-09 18:40 ` Junio C Hamano
2015-10-09 18:55 ` Junio C Hamano
2015-10-12 9:46 ` Johannes Schindelin [this message]
2015-10-09 20:46 ` Junio C Hamano
2015-10-12 9:40 ` Johannes Schindelin
2015-10-12 20:28 ` Junio C Hamano
2015-10-13 11:48 ` Johannes Schindelin
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=793ef29a6d9c77b4f4be478239b74089@dscho.org \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.com \
--cc=shiftkey@github.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).