Re: [PATCH v8 06/11] reset: introduce ability to skip updating HEAD
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jul 3, 2026, 08:42 UTC
- Message-ID
- <akd14OKLT9lAMKTf@pks.im>
- In-Reply-To
- <CAP8UFD3RZv=PGC15xms3xZZkNQsGLpgq_ogt8P9ux-8p4HwW6A@mail.gmail.com>
On Fri, Jul 03, 2026 at 08:59:30AM +0200, Christian Couder wrote:
Show 10 quoted lines
> 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?
Patrick