diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-11 13:28:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-11 13:30:55 -0800 |
| commit | 71fc224fe8af9202eb60c98a128150fd0ae23090 (patch) | |
| tree | 39fbd2c5174c07ffde80c40b02c0e70f050057da /t/t3402-rebase-merge.sh | |
| parent | f772c34ce09a49eb553240eb672bf0cc2dbcb10a (diff) | |
| download | git-71fc224fe8af9202eb60c98a128150fd0ae23090.tar.gz git-71fc224fe8af9202eb60c98a128150fd0ae23090.tar.xz | |
t3402: test "rebase -s<strategy> -X<opt>"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3402-rebase-merge.sh')
| -rwxr-xr-x | t/t3402-rebase-merge.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index 2bea65634..be8c1d5ef 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -117,4 +117,25 @@ test_expect_success 'picking rebase' ' esac ' +test_expect_success 'rebase -s funny -Xopt' ' + test_when_finished "rm -fr test-bin funny.was.run" && + mkdir test-bin && + cat >test-bin/git-merge-funny <<-EOF && + #!$SHELL_PATH + case "\$1" in --opt) ;; *) exit 2 ;; esac + shift && + >funny.was.run && + exec git merge-recursive "\$@" + EOF + chmod +x test-bin/git-merge-funny && + git reset --hard && + git checkout -b test-funny master^ && + test_commit funny && + ( + PATH=./test-bin:$PATH + git rebase -s funny -Xopt master + ) && + test -f funny.was.run +' + test_done |