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
--
2.18.0.9.g431b2c36d5
