From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 08 Sep 2026 20:57:06 GMT
Subject: Re: [PATCH v15 4/8] history: add skeleton for squash subcommand
Message-ID: <xmqqik4fv4v1.fsf@gitster.g>
In-Reply-To: <8ad1faaa9a4ab71560b4e9321886706164518e9e.1788900120.git.gitgitgadget@gmail.com>

"Harald Nordgren via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Harald Nordgren <haraldnordgren@gmail.com>
>
> Add the entry point and option parsing for "git history squash". Pass
> the remaining arguments through setup_revisions() so the command accepts
> revision ranges and rev-list options, while restoring the ordering and
> simplification settings required by the fold if an option changes them.
>
> Require at least one BOTTOM revision. The squashed commit needs a commit
> outside the selected range to serve as its base, so a single positive
> revision is not a sufficient range.
>
> Keep this step limited to defining the revision input contract so graph
> validation and the rewrite can be added independently.
>
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
> ---
>  Documentation/git-history.adoc |  1 +
>  builtin/history.c              | 94 ++++++++++++++++++++++++++++++++++
>  t/t9902-completion.sh          |  1 +
>  3 files changed, 96 insertions(+)

Nice.  As the "complete 'git history'" topic is now in, with this part

> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
> index 38cf221718..978c42c629 100755
> --- a/t/t9902-completion.sh
> +++ b/t/t9902-completion.sh
> @@ -3227,6 +3227,7 @@ test_expect_success 'git history subcommands' '
>  	fixup Z
>  	reword Z
>  	split Z
> +	squash Z
>  	EOF
>  	test_completion "git history --" ""
>  '

being a part of this series, I no longer need to worry about making
an evil merge for this ;-).

Thanks.