diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-17 21:18:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 21:18:19 (GMT) |
| commit | 5d268edff8a271fe68f525e8d382a13b96c71a81 (patch) | |
| tree | 58a610f4a1bed6d647c824617d6a95236f99999d | |
| parent | 11fe3f73cce13b759a728b0a9ac95e745470f251 (diff) | |
| parent | 71fc224fe8af9202eb60c98a128150fd0ae23090 (diff) | |
| download | git-5d268edff8a271fe68f525e8d382a13b96c71a81.zip git-5d268edff8a271fe68f525e8d382a13b96c71a81.tar.gz git-5d268edff8a271fe68f525e8d382a13b96c71a81.tar.bz2 | |
Merge branch 'mz/maint-rebase-X-fix' into maint
* mz/maint-rebase-X-fix:
t3402: test "rebase -s<strategy> -X<opt>"
| -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 2bea656..be8c1d5 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 |