Re: [PATCH v8 06/11] reset: introduce ability to skip updating HEAD
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 3, 2026, 17:33 UTC
- Message-ID
- <xmqqwlvchta8.fsf@gitster.g>
- In-Reply-To
- <akd14OKLT9lAMKTf@pks.im>
Patrick Steinhardt <ps@pks.im> writes:
Show 14 quoted lines
> On Fri, Jul 03, 2026 at 08:59:30AM +0200, Christian Couder wrote:
>> On Wed, Jul 1, 2026 at 1:35 PM Patrick Steinhardt <ps@pks.im> wrote:
>>
>> > @@ -113,6 +114,9 @@ int reset_working_tree(struct repository *r,
>> > if (opts->branch_msg && !opts->branch)
>> > BUG("branch reflog message given without a branch");
>> >
>> > + if (update_orig_head && !update_head)
>> > + BUG("cannot update ORIG_HEAD without updating HEAD" );
>>
>> There is a spurious space character between `HEAD"` and `);`.
>
> Ugh, indeed, well spotted. Junio, is this something you can fix up or
> shall I send a new version for this?I just locally updated it, so no need to resend the whole series, as there does not seem to be any other issues.
Thanks, all.