Thread (119 messages) 119 messages, 6 authors, 1d ago

Re: [PATCH v8 06/11] reset: introduce ability to skip updating HEAD

From: Junio C Hamano <hidden>
Date: 2026-07-03 17:33:54

Patrick Steinhardt [off-list ref] writes:
On Fri, Jul 03, 2026 at 08:59:30AM +0200, Christian Couder wrote:
quoted
On Wed, Jul 1, 2026 at 1:35 PM Patrick Steinhardt [off-list ref] wrote:
quoted
@@ -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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help