All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: git@vger.kernel.org,  Pablo Sabater <pabloosabaterr@gmail.com>,
	Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>,
	 Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v5 06/10] reset: introduce ability to skip updating HEAD
Date: Thu, 11 Jun 2026 11:00:25 -0700	[thread overview]
Message-ID: <xmqq33ytneiu.fsf@gitster.g> (raw)
In-Reply-To: <20260611-b4-pks-history-drop-v5-6-34d35725559c@pks.im> (Patrick Steinhardt's message of "Thu, 11 Jun 2026 15:27:09 +0200")

Patrick Steinhardt <ps@pks.im> writes:

> Note that in a previous iteration we instead introduced a flag that made
> callers opt out of updating any references. This was somewhat awkward
> though because we already have the `UPDATE_ORIG_HEAD` flag, so the
> result was somewhat inconsistent.
>
> Suggested-by: Phillip Wood <phillip.wood123@gmail.com>
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
>  builtin/rebase.c | 14 ++++++++++----
>  reset.c          |  9 +++++++--
>  reset.h          |  9 ++++++---
>  sequencer.c      |  4 +++-
>  4 files changed, 26 insertions(+), 10 deletions(-)
>
> diff --git a/reset.c b/reset.c
> ...
> @@ -129,7 +133,7 @@ int reset_working_tree(struct repository *r,
>  		oid = &head_oid;
>  
>  	if (refs_only) {
> -		if (!dry_run)
> +		if (update_head)
>  			return update_refs(r, opts, oid, head);
>  		return 0;
>  	}

So when refs_only and update-head are in effect, we will call
update_refs(), even if dry_run is given.  update_refs() does not
seem to pay attention to (opts->flags & RESET_WORKING_TREE_DRY_RUN)
at all, so wouldn't this mean that we would update even in a dry-run
session?



  reply	other threads:[~2026-06-11 18:00 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-01 15:36 [PATCH 0/2] builtin/history: introduce "drop" subcommand Patrick Steinhardt
2026-06-01 15:36 ` [PATCH 1/2] builtin/history: split handling of ref updates into two phases Patrick Steinhardt
2026-06-01 15:36 ` [PATCH 2/2] builtin/history: implement "drop" subcommand Patrick Steinhardt
2026-06-01 23:43   ` Junio C Hamano
2026-06-03 10:06     ` Patrick Steinhardt
2026-06-02  7:31   ` Pablo Sabater
2026-06-03 10:06     ` Patrick Steinhardt
2026-06-03 16:13 ` [PATCH v2 0/9] builtin/history: introduce " Patrick Steinhardt
2026-06-03 16:14   ` [PATCH v2 1/9] read-cache: split out function to drop unmerged entries to stage 0 Patrick Steinhardt
2026-06-03 16:14   ` [PATCH v2 2/9] reset: drop `USE_THE_REPOSITORY_VARIABLE` Patrick Steinhardt
2026-06-03 16:14   ` [PATCH v2 3/9] reset: modernize flags passed to `reset_head()` Patrick Steinhardt
2026-06-03 18:01     ` Kristoffer Haugsbakk
2026-06-05 15:08     ` Phillip Wood
2026-06-08  9:14       ` Patrick Steinhardt
2026-06-03 16:14   ` [PATCH v2 4/9] reset: introduce dry-run mode Patrick Steinhardt
2026-06-03 18:18     ` Kristoffer Haugsbakk
2026-06-03 23:49     ` Junio C Hamano
2026-06-03 16:14   ` [PATCH v2 5/9] reset: introduce ability to skip reference updates Patrick Steinhardt
2026-06-03 23:51     ` Junio C Hamano
2026-06-04  9:01       ` Patrick Steinhardt
2026-06-05 15:12     ` Phillip Wood
2026-06-08  9:14       ` Patrick Steinhardt
2026-06-08  9:18         ` Patrick Steinhardt
2026-06-09 10:03           ` Phillip Wood
2026-06-10  7:31             ` Patrick Steinhardt
2026-06-03 16:14   ` [PATCH v2 6/9] reset: allow the caller to specify the current HEAD object Patrick Steinhardt
2026-06-03 16:14   ` [PATCH v2 7/9] reset: stop assuming that the caller passes in a clean index Patrick Steinhardt
2026-06-03 16:14   ` [PATCH v2 8/9] builtin/history: split handling of ref updates into two phases Patrick Steinhardt
2026-06-03 16:14   ` [PATCH v2 9/9] builtin/history: implement "drop" subcommand Patrick Steinhardt
2026-06-03 19:04     ` Kristoffer Haugsbakk
2026-06-04  9:02       ` Patrick Steinhardt
2026-06-03 23:58     ` Junio C Hamano
2026-06-04  9:02       ` Patrick Steinhardt
2026-06-08 10:23 ` [PATCH v3 0/9] builtin/history: introduce " Patrick Steinhardt
2026-06-08 10:23   ` [PATCH v3 1/9] read-cache: split out function to drop unmerged entries to stage 0 Patrick Steinhardt
2026-06-08 10:23   ` [PATCH v3 2/9] reset: drop `USE_THE_REPOSITORY_VARIABLE` Patrick Steinhardt
2026-06-08 10:23   ` [PATCH v3 3/9] reset: modernize flags passed to `reset_head()` Patrick Steinhardt
2026-06-08 10:23   ` [PATCH v3 4/9] reset: introduce dry-run mode Patrick Steinhardt
2026-06-08 10:23   ` [PATCH v3 5/9] reset: introduce ability to skip reference updates Patrick Steinhardt
2026-06-08 10:23   ` [PATCH v3 6/9] reset: allow the caller to specify the current HEAD object Patrick Steinhardt
2026-06-08 10:23   ` [PATCH v3 7/9] reset: stop assuming that the caller passes in a clean index Patrick Steinhardt
2026-06-08 10:23   ` [PATCH v3 8/9] builtin/history: split handling of ref updates into two phases Patrick Steinhardt
2026-06-08 10:23   ` [PATCH v3 9/9] builtin/history: implement "drop" subcommand Patrick Steinhardt
2026-06-10  8:52 ` [PATCH v4 00/10] builtin/history: introduce " Patrick Steinhardt
2026-06-10  8:52   ` [PATCH v4 01/10] read-cache: split out function to drop unmerged entries to stage 0 Patrick Steinhardt
2026-06-10  8:52   ` [PATCH v4 02/10] reset: drop `USE_THE_REPOSITORY_VARIABLE` Patrick Steinhardt
2026-06-10  8:52   ` [PATCH v4 03/10] reset: rename `reset_head()` Patrick Steinhardt
2026-06-10 13:10     ` Phillip Wood
2026-06-10  8:52   ` [PATCH v4 04/10] reset: modernize flags passed to `reset_working_tree()` Patrick Steinhardt
2026-06-10 13:10     ` Phillip Wood
2026-06-10  8:52   ` [PATCH v4 05/10] reset: introduce dry-run mode Patrick Steinhardt
2026-06-10  8:52   ` [PATCH v4 06/10] reset: introduce ability to skip updating HEAD Patrick Steinhardt
2026-06-10 13:11     ` Phillip Wood
2026-06-11 11:47       ` Patrick Steinhardt
2026-06-10  8:52   ` [PATCH v4 07/10] reset: allow the caller to specify the current HEAD object Patrick Steinhardt
2026-06-10  8:52   ` [PATCH v4 08/10] reset: stop assuming that the caller passes in a clean index Patrick Steinhardt
2026-06-10  8:52   ` [PATCH v4 09/10] builtin/history: split handling of ref updates into two phases Patrick Steinhardt
2026-06-10 16:25     ` Junio C Hamano
2026-06-10  8:52   ` [PATCH v4 10/10] builtin/history: implement "drop" subcommand Patrick Steinhardt
2026-06-11 13:27 ` [PATCH v5 00/10] builtin/history: introduce " Patrick Steinhardt
2026-06-11 13:27   ` [PATCH v5 01/10] read-cache: split out function to drop unmerged entries to stage 0 Patrick Steinhardt
2026-06-11 13:27   ` [PATCH v5 02/10] reset: drop `USE_THE_REPOSITORY_VARIABLE` Patrick Steinhardt
2026-06-11 13:27   ` [PATCH v5 03/10] reset: rename `reset_head()` Patrick Steinhardt
2026-06-11 13:27   ` [PATCH v5 04/10] reset: modernize flags passed to `reset_working_tree()` Patrick Steinhardt
2026-06-11 13:27   ` [PATCH v5 05/10] reset: introduce dry-run mode Patrick Steinhardt
2026-06-11 13:27   ` [PATCH v5 06/10] reset: introduce ability to skip updating HEAD Patrick Steinhardt
2026-06-11 18:00     ` Junio C Hamano [this message]
2026-06-11 13:27   ` [PATCH v5 07/10] reset: allow the caller to specify the current HEAD object Patrick Steinhardt
2026-06-11 13:27   ` [PATCH v5 08/10] reset: stop assuming that the caller passes in a clean index Patrick Steinhardt
2026-06-11 13:27   ` [PATCH v5 09/10] builtin/history: split handling of ref updates into two phases Patrick Steinhardt
2026-06-11 13:27   ` [PATCH v5 10/10] builtin/history: implement "drop" subcommand Patrick Steinhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq33ytneiu.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=kristofferhaugsbakk@fastmail.com \
    --cc=pabloosabaterr@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=ps@pks.im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.