Skip to content

Clean up after the removal of the scripted rebase

Johannes Schindelin via GitGitGadget git 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest5 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5Drop unused git-rebase--am.sh.gitignore Makefile builtin/rebase.c +1 more+0 -910 replies
2/5t3400: stop referring to the scripted rebaset/t3400-rebase.sh+1 -10 replies
3/5.gitignore: there is no longer a built-in `git-rebase--interactive`.gitignore+0 -10 replies
4/5sequencer: the `am` and `rebase--interactive` scripts are gonesequencer.c+1 -10 replies
5/5rebase: fold git-rebase--common into the -p backend.gitignore Makefile builtin/rebase.c +2 more+56 -730 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/5] Clean up after the removal of the scripted rebase

Technically, there is still one part that is scripted: git rebase --preserve-merges. But that is already deprecated, and the remaining parts really are no longer scripted.

Meaning that we do not need git-rebase--am.sh.

While at it, clean up a few other places that reference the scripted rebase, and also move the functions from git-rebase--common.sh directly into the -p backend (because it is the sole remaining user).

Johannes Schindelin (5):
Drop unused git-rebase--am.sh
t3400: stop referring to the scripted rebase
.gitignore: there is no longer a built-in git-rebase--interactive
sequencer: the am and rebase--interactive scripts are gone
rebase: fold git-rebase--common into the -p backend

 .gitignore                     |  3 --
 Makefile                       |  2 -
 builtin/rebase.c               |  7 +--
 git-rebase--am.sh              | 85 ----------------------------------
 git-rebase--common.sh          | 69 ---------------------------
 git-rebase--preserve-merges.sh | 55 ++++++++++++++++++++++
 sequencer.c                    |  2 +-
 t/t3400-rebase.sh              |  2 +-
 8 files changed, 58 insertions(+), 167 deletions(-)
 delete mode 100644 git-rebase--am.sh
 delete mode 100644 git-rebase--common.sh

base-commit: ab15ad1a3b4b04a29415aef8c9afa2f64fc194a2
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-194%2Fdscho%2Fdrop-rebase--am.sh-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-194/dscho/drop-rebase--am.sh-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/194

Signature · 1 line
gitgitgadget