t3402: test "rebase -s<strategy> -X<opt>"
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Nov 11, 2010 at 13:28 UTC
71fc224fe8af9202eb60c98a128150fd0ae23090
1 file changed
+21
t/t3402-rebase-merge.sh
+21
@@ -117,4 +117,25 @@ test_expect_success 'picking rebase' '
117
esac
118
'
119
120
+test_expect_success 'rebase -s funny -Xopt' '
121
+ test_when_finished "rm -fr test-bin funny.was.run" &&
122
+ mkdir test-bin &&
123
+ cat >test-bin/git-merge-funny <<-EOF &&
124
+ #!$SHELL_PATH
125
+ case "\$1" in --opt) ;; *) exit 2 ;; esac
126
+ shift &&
127
+ >funny.was.run &&
128
+ exec git merge-recursive "\$@"
129
+ EOF
130
+ chmod +x test-bin/git-merge-funny &&
131
+ git reset --hard &&
132
+ git checkout -b test-funny master^ &&
133
+ test_commit funny &&
134
+ (
135
+ PATH=./test-bin:$PATH
136
+ git rebase -s funny -Xopt master
137
+ ) &&
138
+ test -f funny.was.run
139
+'
140
+
141
test_done