From: Junio C Hamano <gitster@pobox•com>
To: Paul Tan <pyokagan@gmail•com>
Cc: Johannes Schindelin <johannes.schindelin@gmx•de>,
Brendan Forster <shiftkey@github•com>,
git@vger•kernel.org
Subject: Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails
Date: Thu, 08 Oct 2015 17:52:56 -0700 [thread overview]
Message-ID: <xmqq612grhg7.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <cover.1444336120.git.johannes.schindelin@gmx.de> (Johannes Schindelin's message of "Thu, 08 Oct 2015 22:35:08 +0200")
Johannes Schindelin <johannes.schindelin@gmx•de> writes:
> Brendan Forster noticed that we no longer see the helpful message after
> a failed `git pull --rebase`. It turns out that the builtin `am` calls
> the recursive merge function directly, not via a separate process.
>
> But that function was not really safe to be called that way, as it
> die()s pretty liberally.
If that is the case, I'd thinkg that we'd prefer, as a regression
fix to correct "that", i.e., let recursive-merge die and let the
caller catch its exit status.
Paul, what do you think?
next prev parent reply other threads:[~2015-10-09 0:53 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 ` Junio C Hamano [this message]
2015-10-09 1:40 ` [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails 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
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=xmqq612grhg7.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=pyokagan@gmail$(echo .)com \
--cc=shiftkey@github$(echo .)com \
/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