Re: [PATCH v2 0/7] Drop support for git rebase --preserve-merges

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Sep 6, 2021, 10:17 UTC
Message-ID: <5fcd3201-53d0-df5d-954e-74da1ef7e130@gmail.com>
In-Reply-To: <62fbd389-28f5-76e5-d3f3-5510415a7bf5@gmail.com>

Hi Alban and Johannes

On 04/09/2021 23:30, Alban Gruin wrote:

Show 23 quoted lines

> Hi Johannes,
> 
> Le 01/09/2021 à 13:57, Johannes Schindelin via GitGitGadget a écrit :
>> In 427c3bd28ab (rebase: deprecate --preserve-merges, 2019-03-11) (which was
>> included in v2.22.0), we officially deprecated the --preserve-merges
>> backend. Over two years later, it is time to drop that backend, and here is
>> a patch series that does just that.
>>
>> Changes since v1:
>>
>>   * Rebased onto v2.33.0
>>
>> Johannes Schindelin (7):
>>    t5520: do not use `pull.rebase=preserve`
>>    remote: warn about unhandled branch.<name>.rebase values
>>    tests: stop testing `git rebase --preserve-merges`
>>    pull: remove support for `--rebase=preserve`
>>    rebase: drop support for `--preserve-merges`
>>    git-svn: drop support for `--preserve-merges`
>>    rebase: drop the internal `rebase--interactive` command
>>
> 
> This is good.

I agree

Show 17 quoted lines

> preserve-merge is the only user of `rebase--interactive'.  In
> builtin/rebase.c, it is the only producer of the following actions:
> 
>   - ACTION_SHORTEN_OIDS
>   - ACTION_EXPAND_OIDS
>   - ACTION_CHECK_TODO_LIST
>   - ACTION_REARRANGE_SQUASH
>   - ACTION_ADD_EXEC
> 
> Which in turn, are the only reason for these functions to exist:
> 
>   - transform_todo_file()
>   - check_todo_list_from_file() (from the sequencer)
>   - rearrange_squash_in_todo_file()
>   - add_exec_commands()
> 
> This is from a cursory glance, it may go a bit deeper.

I think patch 7 addresses most of that apart from the removal of the enum members and check_todo_list_from_file()

Best Wishes

Phillip

Show 5 quoted lines

> 
> Should we remove these as well?
> 
> Alban
>