public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Phillip Wood <phillip.wood123@gmail•com>
To: "René Scharfe" <l.s.r@web•de>,
	"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail•com>,
	git@vger•kernel.org
Cc: Siddharth Asthana <siddharthasthana31@gmail•com>
Subject: Re: [PATCH] replay: move onto NULL check before first use
Date: Mon, 15 Dec 2025 10:10:27 +0000	[thread overview]
Message-ID: <a017e50f-7c8f-461f-8627-2fd1445d29f6@gmail.com> (raw)
In-Reply-To: <9db2b913-b5d6-4617-b079-b4612eaa2b97@web.de>

On 11/12/2025 17:56, René Scharfe wrote:
> cmd_replay() aborts if the pointer "onto" is NULL after argument
> parsing, e.g. when specifying a non-existing commit with --onto.
> 15cd4ef1f4 (replay: make atomic ref updates the default behavior,
> 2025-11-06) added code that dereferences this pointer before the check.
> Switch their places to avoid a segmentation fault.

This fixes the regression nicely. There is a preexisting bug that we 
treat an invalid --onto argument the same as a missing argument but that 
can be fixed separately.

Thanks

Phillip

> Reported-by: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail•com>
> Signed-off-by: René Scharfe <l.s.r@web•de>
> ---
>   builtin/replay.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/builtin/replay.c b/builtin/replay.c
> index 507b909df7..64ad2f0f04 100644
> --- a/builtin/replay.c
> +++ b/builtin/replay.c
> @@ -454,6 +454,9 @@ int cmd_replay(int argc,
>   	determine_replay_mode(repo, &revs.cmdline, onto_name, &advance_name,
>   			      &onto, &update_refs);
>   
> +	if (!onto) /* FIXME: Should handle replaying down to root commit */
> +		die("Replaying down to root commit is not supported yet!");
> +
>   	/* Build reflog message */
>   	if (advance_name_opt)
>   		strbuf_addf(&reflog_msg, "replay --advance %s", advance_name_opt);
> @@ -472,9 +475,6 @@ int cmd_replay(int argc,
>   		}
>   	}
>   
> -	if (!onto) /* FIXME: Should handle replaying down to root commit */
> -		die("Replaying down to root commit is not supported yet!");
> -
>   	if (prepare_revision_walk(&revs) < 0) {
>   		ret = error(_("error preparing revisions"));
>   		goto cleanup;

next prev parent reply	other threads:[~2025-12-15 10:10 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-11 16:34 [BUG] replay: segmentation fault when mistyping target to --onto Kristoffer Haugsbakk
2025-12-11 17:56 ` [PATCH] replay: move onto NULL check before first use René Scharfe
2025-12-15 10:10   ` Phillip Wood [this message]
2025-12-15 12:04     ` Kristoffer Haugsbakk

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=a017e50f-7c8f-461f-8627-2fd1445d29f6@gmail.com \
    --to=phillip.wood123@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=kristofferhaugsbakk@fastmail$(echo .)com \
    --cc=l.s.r@web$(echo .)de \
    --cc=phillip.wood@dunelm$(echo .)org.uk \
    --cc=siddharthasthana31@gmail$(echo .)com \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox