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

Hi Alban,

On Sun, 5 Sep 2021, Alban Gruin wrote:

Le 01/09/2021 à 13:57, Johannes Schindelin via GitGitGadget a écrit :

quoted

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.

Thanks!

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

Makes sense!

Which in turn, are the only reason for these functions to exist:

 - transform_todo_file()

My patch series already removed this.

 - check_todo_list_from_file() (from the sequencer)

Good point!

 - rearrange_squash_in_todo_file()

This was already removed by my patch series.

 - add_exec_commands()

Actually, this function is still needed, but its scope can be reduced.

Thank you!
Dscho