Re: [PATCH v3] rerere: fix crashes due to unmatched opening conflict markers
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 15, 2024, 20:15 UTC
- Message-ID
- <xmqq7cgymlg8.fsf@gitster.g>
- In-Reply-To
- <20240409121708.131542-2-marcel@roethke.info>
Marcel Röthke <marcel@roethke.info> writes:
Show 6 quoted lines
> +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