git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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
Previous: Christian CouderNext: Junio C Hamano
Message 9 of 18 in “builtin/history: introduce "drop" subcommand”
  1. 00/11 builtin/history: introduce "drop" subcommandPatrick Steinhardt, Jul 1, 2026
  2. 01/11 read-cache: split out function to drop unmerged entries to stage 0Patrick Steinhardt, Jul 1, 2026
  3. 02/11 reset: drop `USE_THE_REPOSITORY_VARIABLE`Patrick Steinhardt, Jul 1, 2026
  4. 03/11 reset: rename `reset_head()`Patrick Steinhardt, Jul 1, 2026
  5. 04/11 reset: modernize flags passed to `reset_working_tree()`Patrick Steinhardt, Jul 1, 2026
  6. 05/11 reset: introduce dry-run modePatrick Steinhardt, Jul 1, 2026
  7. 06/11 reset: introduce ability to skip updating HEADPatrick Steinhardt, Jul 1, 2026
  8. Christian CouderJul 3, 2026
  9. Patrick SteinhardtJul 3, 2026
  10. Junio C HamanoJul 3, 2026
  11. 07/11 reset: allow the caller to specify the current HEAD objectPatrick Steinhardt, Jul 1, 2026
  12. 08/11 reset: stop assuming that the caller passes in a clean indexPatrick Steinhardt, Jul 1, 2026
  13. 09/11 replay: expose `replay_result_queue_update()`Patrick Steinhardt, Jul 1, 2026
  14. 10/11 builtin/history: split handling of ref updates into two phasesPatrick Steinhardt, Jul 1, 2026
  15. 11/11 builtin/history: implement "drop" subcommandPatrick Steinhardt, Jul 1, 2026
  16. Junio C HamanoJul 1, 2026
  17. Christian CouderJul 3, 2026
  18. Junio C HamanoJul 3, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.