rebase --merge: fix fast forwarding when `rebase.abbreviateCommands' is set
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest2 patches 2 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | sequencer: don't abbreviate a command if it doesn't have a short formsequencer.c | +6 | 2 replies | |
| 2/2 | t3432: test `--merge' with `rebase.abbreviateCommands = true', toot/ | +19 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH v1 0/2] rebase --merge: fix fast forwarding when `rebase.abbreviateCommands' is set
Jan Alexander Steffens reported that when rebase.abbreviateCommands' is set, the merge backend fails to fast forward. This is because the backend generates a todo list with only a noop', and since this command has no abbreviated form, it is replaced by a comment mark. The sequencer then interprets it as if there is nothing to do, and fails.
This patch series fixes this issue by teaching the sequencer not to abbreviate a command if it does not have a short form, and adds a bunch of regression tests.
This series is based on 9fadedd637 ("Merge branch 'ds/default-pack-use-sparse-to-true'", 2020-03-29).
The tip of this series is tagged as "rebase-dont-abbreviate-v1" at
https://github.com/agrn/git.
Alban Gruin (2):
sequencer: don't abbreviate a command if it doesn't have a short form
t3432: test --merge' with rebase.abbreviateCommands = true', too
sequencer.c | 9 ++++++--- t/t3432-rebase-fast-forward.sh | 24 +++++++++++++++++++----- 2 files changed, 25 insertions(+), 8 deletions(-)
Signature · 1 line
2.25.0