From: Jeff King <peff@peff.net>
To: Alejandro Sanchez <asanchez1987@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH 0/4] fix BUG() with "git am -i --resolved"
Date: Mon, 20 May 2019 08:06:36 -0400 [thread overview]
Message-ID: <20190520120636.GA12634@sigill.intra.peff.net> (raw)
In-Reply-To: <20190520100211.GA26426@sigill.intra.peff.net>
On Mon, May 20, 2019 at 06:02:11AM -0400, Jeff King wrote:
> I haven't tried to reproduce yet. Is the repository (and patch) that you
> used to demonstrate this publicly available? Or alternatively, is it
> possible to show a backtrace from the coredump?
Never mind. It reproduces quite easily, because AFAICT "am -i
--resolved" has been totally broken since it was converted to C (in
2015!). I guess it does not have many users. :)
> If my blind guess is right, then something like this probably fixes it:
This is indeed the problem. Here are some patches. The actual fix is
what I showed already. The other three are just making it possible to
cover this with the test suite (until now, we had no coverage of "am
--interactive" at all).
[1/4]: am: simplify prompt response handling
[2/4]: am: read interactive input from stdin
[3/4]: am: drop tty requirement for --interactive
[4/4]: am: fix --interactive HEAD tree resolution
builtin/am.c | 30 +++++++++++++++---------
t/t4257-am-interactive.sh | 49 +++++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+), 11 deletions(-)
create mode 100755 t/t4257-am-interactive.sh
-Peff
next prev parent reply other threads:[~2019-05-20 12:06 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-20 8:35 Abort (core dumped) Alejandro Sanchez
2019-05-20 10:02 ` Jeff King
2019-05-20 12:06 ` Jeff King [this message]
2019-05-20 12:07 ` [PATCH 1/4] am: simplify prompt response handling Jeff King
2019-05-20 12:09 ` [PATCH 2/4] am: read interactive input from stdin Jeff King
2019-05-20 12:11 ` [PATCH 3/4] am: drop tty requirement for --interactive Jeff King
2019-05-20 12:50 ` Jeff King
2019-05-23 6:44 ` Johannes Schindelin
2019-05-24 6:27 ` Jeff King
2021-11-02 16:48 ` [PATCH 0/2] prompt.c: split up git_prompt(), read from /dev/tty, not STDIN Ævar Arnfjörð Bjarmason
2021-11-02 16:48 ` [PATCH 1/2] prompt.c: split up the password and non-password handling Ævar Arnfjörð Bjarmason
2021-11-03 11:53 ` Jeff King
2021-11-03 17:28 ` Junio C Hamano
2021-11-02 16:48 ` [PATCH 2/2] prompt.c: add and use a GIT_TEST_TERMINAL_PROMPT=true Ævar Arnfjörð Bjarmason
2021-11-03 11:57 ` Jeff King
2021-11-03 15:12 ` Ævar Arnfjörð Bjarmason
2021-11-04 9:58 ` Jeff King
2021-11-03 17:42 ` Junio C Hamano
2021-11-04 8:48 ` Johannes Schindelin
2021-11-04 9:47 ` Jeff King
2021-11-04 9:53 ` Jeff King
2019-05-20 12:13 ` [PATCH 4/4] am: fix --interactive HEAD tree resolution Jeff King
2019-05-23 7:12 ` Johannes Schindelin
2019-05-24 6:39 ` Jeff King
2019-05-24 6:46 ` [PATCH v2 " Jeff King
2019-05-28 11:06 ` [PATCH " Johannes Schindelin
2019-05-28 21:35 ` Jeff King
2019-05-29 11:56 ` Johannes Schindelin
2019-09-26 14:20 ` Alejandro Sanchez
2019-09-26 21:11 ` 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=20190520120636.GA12634@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=asanchez1987@gmail.com \
--cc=git@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.