mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
t3402: test "rebase -s<strategy> -X<opt>"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f772c34ce0
commit
71fc224fe8
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue