Skip to content

Reimplement rebase --merge via interactive machinery

Elijah Newren git 5 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest8 patches 0 repliesNew
  2. v48 patches 25 repliesSuperseded
  3. v37 patches 4 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v22 patches9 repliesSuperseded
v1 RFC3 patches14 repliesSuperseded

Patches in v5 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8rebase: make builtin and legacy script error messages the samebuiltin/rebase.c git-legacy-rebase.sh+11 -110 replies
2/8rebase: fix incompatible options error messagebuiltin/rebase.c git-legacy-rebase.sh+5 -90 replies
3/8t5407: add a test demonstrating how interactive handles --skip differentlyt/t5407-post-rewrite-hook.sh+31 -00 replies
4/8am, rebase--merge: do not overlook --skip'ed commits with post-rewritebuiltin/am.c git-rebase--merge.sh t/t5407-post-rewrite-hook.sh+14 -00 replies
5/8git-rebase, sequencer: extend --quiet option for the interactive machinerybuiltin/rebase.c git-legacy-rebase.sh git-rebase--common.sh +2 more+17 -160 replies
6/8git-legacy-rebase: simplify unnecessary triply-nested ifgit-legacy-rebase.sh+8 -120 replies
7/8rebase: define linearization ordering and enforce itgit-rebase--am.sh git-rebase--merge.sh t/t3425-rebase-topology-merges.sh+8 -110 replies
8/8rebase: implement --merge via the interactive machinery.gitignore Documentation/git-rebase.txt Makefile +7 more+43 -2970 replies

Reviews trailers per patch

All 8 patches have a Reviewed-by or Acked-by.

PatchJohannes Schindelin
1/8A-b
2/8A-b
3/8A-b
4/8A-b
5/8A-b
6/8A-b
7/8A-b
8/8A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

Cover letter [PATCH v5 0/8] Reimplement rebase --merge via interactive machinery

This series continues the work of making rebase more self-consistent by removing inconsistencies between different backends. In particular, this series focuses on making the merge machinery behave like the interactive machinery (though a few differences between the am and interactive backends are also fixed along the way), and ultimately removes the merge backend in favor of reimplementing the relevant options on top of the interactive machinery.

Differences since v4:
- Included Dscho's Acked-by (from

    https://public-inbox.org/git/[email protected]/)

Elijah Newren (8):
rebase: make builtin and legacy script error messages the same
rebase: fix incompatible options error message
t5407: add a test demonstrating how interactive handles --skip
differently
am, rebase--merge: do not overlook --skip'ed commits with post-rewrite git-rebase, sequencer: extend --quiet option for the interactive
machinery
git-legacy-rebase: simplify unnecessary triply-nested if
rebase: define linearization ordering and enforce it
rebase: implement --merge via the interactive machinery

 .gitignore                        |   1 -
 Documentation/git-rebase.txt      |  17 +---
 Makefile                          |   1 -
 builtin/am.c                      |   9 ++
 builtin/rebase.c                  |  30 ++----
 git-legacy-rebase.sh              |  65 ++++++------
 git-rebase--am.sh                 |   2 +-
 git-rebase--common.sh             |   2 +-
 git-rebase--merge.sh              | 164 ------------------------------
 sequencer.c                       |  23 +++--
 sequencer.h                       |   1 +
 t/t3406-rebase-message.sh         |   7 +-
 t/t3420-rebase-autostash.sh       |  78 ++------------
 t/t3421-rebase-topology-linear.sh |  10 +-
 t/t3425-rebase-topology-merges.sh |  15 ++-
 t/t5407-post-rewrite-hook.sh      |  34 +++++++
 t/t9903-bash-prompt.sh            |   2 +-
 17 files changed, 121 insertions(+), 340 deletions(-)
 delete mode 100644 git-rebase--merge.sh
Signature · 1 line
2.20.1.310.g17ca096f17