Fix use of strategy options with interactive rebases
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest2 patches 5 repliesIn review
- v22 patches 14 repliesSuperseded
Changes in v3 from the cover letter
- Fix broken &&-chaining (Thanks to Eric for spotting)
Patches in v3 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | t3418: add testcase showing problems with rebase -i and strategy optionst/ | +32 | 3 replies | |
| 2/2 | Fix use of strategy options with interactive rebasesgit-rebase.sh sequencer.c t/ | +8 | 2 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.
Cover letter [PATCH v3 0/2] Fix use of strategy options with interactive rebases
The interactive machinery for git rebase can accept special merge strategies or strategy options, but has a bug in its handling of strategy options. This short series patches that.
Changes since v2:
- Fix broken &&-chaining (Thanks to Eric for spotting)
Elijah Newren (2):
t3418: add testcase showing problems with rebase -i and strategy
options
Fix use of strategy options with interactive rebases
git-rebase.sh | 2 +- sequencer.c | 7 ++++++- t/t3418-rebase-continue.sh | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-)
1: 43b9ac5a63 ! 1: f8a5df9ef1 t3418: add testcase showing problems with rebase -i and strategy options
@@ -34,7 +34,7 @@
+ EOF
+ chmod +x test-bin/git-merge-funny &&
+ (
-+ PATH=./test-bin:$PATH
++ PATH=./test-bin:$PATH &&
+ test_must_fail git rebase -i -s funny -Xopt -Xfoo master topic
+ ) &&
+ test -f funny.was.run &&
@@ -42,7 +42,7 @@
+ echo "Resolved" >F2 &&
+ git add F2 &&
+ (
-+ PATH=./test-bin:$PATH
++ PATH=./test-bin:$PATH &&
+ git rebase --continue
+ ) &&
+ test -f funny.was.run 2: d345eb96d5 = 2: b7e4971e66 Fix use of strategy options with interactive rebases
Signature · 1 line
2.18.0.9.g431b2c36d5