X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3402-rebase-merge.sh;h=be8c1d5ef9fd650c128a9fe7126cbcd8db6c5a95;hb=ff7f089ed1064b6a10e958bf405f828226262424;hp=2bea65634a1790ceecf824309c1fbb66250f58d5;hpb=0c61c6de3497900616b66a65dc41b27544131ed5;p=git.git

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