From: "Marcel Röthke" <marcel@roethke•info>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH v3] rerere: fix crashes due to unmatched opening conflict markers
Date: Tue, 16 Apr 2024 12:50:22 +0200 [thread overview]
Message-ID: <Zh5X7rKXCkDdNqgO@roethke.info> (raw)
In-Reply-To: <xmqq7cgymlg8.fsf@gitster.g>
On 2024-04-15 13:15:35, Junio C Hamano wrote:
> Marcel Röthke <marcel@roethke•info> writes:
>
> > +test_expect_success 'rerere does not crash with unmatched conflict marker' '
> > + git config rerere.enabled true &&
> > ...
> > + git rebase --continue
> > +'
> > +
>
> This one fails, either standalone or when merged to 'seen'.
>
> A sample CI run that failed can be seen here (you probably need to
> be logged in to view it):
>
> https://github.com/git/git/actions/runs/8694652245/job/23844028985#step:5:1894
Yes, sorry that I missed that. The last git rebase command in that test needs
a test_must_fail because we expect a merge conflict.
Will be fixed in v4.
next prev parent reply other threads:[~2024-04-16 10:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-18 11:49 [PATCH] rerere: fix crash in during clear Marcel Röthke
2024-02-18 13:02 ` Kristoffer Haugsbakk
2024-02-18 19:38 ` Marcel Röthke
2024-02-18 19:46 ` [PATCH v2] rerere: fix crash " Marcel Röthke
2024-02-20 1:22 ` Junio C Hamano
2024-02-24 11:25 ` Marcel Röthke
2024-03-24 21:51 ` Junio C Hamano
2024-03-25 19:30 ` Marcel Röthke
2024-04-07 20:12 ` Marcel Röthke
2024-04-08 15:18 ` Junio C Hamano
2024-04-09 12:13 ` [PATCH v3] rerere: fix crashes due to unmatched opening conflict markers Marcel Röthke
2024-04-12 23:37 ` Junio C Hamano
2024-04-15 20:15 ` Junio C Hamano
2024-04-16 10:50 ` Marcel Röthke [this message]
2024-04-16 10:52 ` [PATCH v4] " Marcel Röthke
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=Zh5X7rKXCkDdNqgO@roethke.info \
--to=marcel@roethke$(echo .)info \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(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