Re: [GSoC][PATCH v3 1/4] rebase: duplicate git-rebase--interactive.sh to git-rebase--preserve-merges.sh

From: Junio C Hamano <gitster@pobox.com>
Date: May 26, 2018, 02:54 UTC
Message-ID: <xmqqk1rrm8ic.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180524114958.26521-2-alban.gruin@gmail.com>

Alban Gruin <alban.gruin@gmail.com> writes:

Show 10 quoted lines

> This duplicates git-rebase--interactive.sh to
> git-rebase--preserve-merges.sh. This is done to split -p from -i. No
> modifications are made to this file here, but any code that is not used by -p
> will be stripped in the next commit.
>
> Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
> ---
>  .gitignore                     |    1 +
>  Makefile                       |    2 +
>  git-rebase--preserve-merges.sh | 1069 ++++++++++++++++++++++++++++++++++++++++

I would normally say "Yuck" to an approach like this series, because it does not force us to make any explicit effort to share as much code between the two codepaths.

But the codepath for "-p" is something that has been abandoned even by its original author and would be going away, so the net effect of this series to the project in the longer term is to remove the "dead code" that will be made unnecessary from "git-rebase--interactive" when support for "-p" gets discarded in a distant future, and do so before we actually remove "-p" (and replace it with the "recreate merges" feature).

So I won't have objection to the approach taken in this series. I may still raise issues on individual changes, though.

Thanks.