On Wed, Jun 27, 2018 at 12:45 AM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Wed, Jun 27, 2018 at 3:36 AM Elijah Newren <new...@gmail.com> wrote: >> We are not passing the same args to merge strategies when we are doing an >> --interactive rebase as we do with a --merge rebase. The merge strategy >> should not need to be aware of which type of rebase is in effect. Add a >> testcase which checks for the appropriate args. >> >> Signed-off-by: Elijah Newren <new...@gmail.com> >> --- >> diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh >> @@ -74,6 +74,38 @@ test_expect_success 'rebase --continue remembers merge >> strategy and options' ' >> +test_expect_failure 'rebase -i --continue handles merge strategy and >> options' ' >> + rm -fr .git/rebase-* && >> + git reset --hard commit-new-file-F2-on-topic-branch && >> + test_commit "commit-new-file-F3-on-topic-branch-for-dash-i" F3 32 && >> + test_when_finished "rm -fr test-bin funny.was.run funny.args" && >> + mkdir test-bin && >> + cat >test-bin/git-merge-funny <<-EOF && >> + #!$SHELL_PATH >> + echo "\$@" >>funny.args >> + case "\$1" in --opt) ;; *) exit 2 ;; esac >> + case "\$2" in --foo) ;; *) exit 2 ;; esac >> + case "\$4" in --) ;; *) exit 2 ;; esac >> + shift 2 && >> + >funny.was.run && >> + exec git merge-recursive "\$@" >> + EOF >> + chmod +x test-bin/git-merge-funny && >> + ( >> + PATH=./test-bin:$PATH > > Broken &&-chain (in subshell). > >> + test_must_fail git rebase -i -s funny -Xopt -Xfoo master >> topic >> + ) && >> + test -f funny.was.run && >> + rm funny.was.run && >> + echo "Resolved" >F2 && >> + git add F2 && >> + ( >> + PATH=./test-bin:$PATH > > Ditto. >
I'm just trying to prove how important your other patch series is. ;-) Doh, sorry for the mistake. Again. I'll fix it up.
