Skip to content

pr-2217/thomasbachem/rebase-auto-maintenance-v2

tagged this 04 Sep 15:51
Changes since v1:

 * Cherry-pick and revert end their sequences with auto maintenance too, and
   keep it out of the "git commit" they spawn, so the three commands now
   behave the same (Phillip).
 * The GIT_CONFIG_PARAMETERS value comes from a helper split out of
   git_config_push_split_parameter() in config.c (new patch 1), built once
   per run and kept in replay_ctx (Phillip).
 * Commit messages rewritten, much shorter (Junio, Phillip).

Based on master. Independent of the rerere lock fix in [1].

[1] <pull.2214.v2.git.1788507876543.gitgitgadget@gmail.com>

Thomas Bachem (3):
  config: add git_config_append_parameter()
  sequencer: run auto maintenance once a sequence is done
  sequencer: keep auto maintenance out of the commands a sequence spawns

 config.c                        | 20 ++++++++----
 config.h                        | 10 ++++++
 sequencer.c                     | 57 +++++++++++++++++++++++++++++----
 t/t3418-rebase-continue.sh      | 26 +++++++++++++++
 t/t3510-cherry-pick-sequence.sh | 27 ++++++++++++++++
 5 files changed, 127 insertions(+), 13 deletions(-)

base-commit: 3cb9185f65410273787f74333cc027d2ea5daada

Submitted-As: https://lore.kernel.org/git/pull.2217.v2.git.1788537086.gitgitgadget@gmail.com
In-Reply-To: https://lore.kernel.org/git/pull.2217.git.1788508426.gitgitgadget@gmail.com
Assets 2
Loading