From: Junio C Hamano Date: Thu, 11 Nov 2010 21:28:57 +0000 (-0800) Subject: t3402: test "rebase -s -X" X-Git-Tag: v1.7.3.3~35^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=71fc224;p=git.git t3402: test "rebase -s -X" Signed-off-by: Junio C Hamano --- 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