Skip to content

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

tagged this 09 Sep 08:25
Changes since v3:

 * Commit messages condensed to about a third (Junio). 3/3 takes Junio's
   wording, except that the setting goes to the commit, merge and exec
   commands the sequencer spawns, not to all of them.

No code change.

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

[1] <pull.2214.v3.git.1788537081930.gitgitgadget@gmail.com>

Thomas Bachem (3):
  config: add git_config_append_parameter()
  rebase, cherry-pick, revert: run auto maintenance when done
  sequencer: disable auto maintenance in spawned commands

 builtin/rebase.c                | 13 ++++++++---
 builtin/revert.c                | 19 +++++++++++------
 config.c                        | 20 +++++++++++------
 config.h                        | 13 +++++++++++
 sequencer.c                     | 38 ++++++++++++++++++++++++++++++---
 t/t3418-rebase-continue.sh      | 17 +++++++++++++++
 t/t3510-cherry-pick-sequence.sh | 31 +++++++++++++++++++++++++++
 7 files changed, 131 insertions(+), 20 deletions(-)

base-commit: 3cb9185f65410273787f74333cc027d2ea5daada

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