From 93ce190cd16b4c5ff16cc000eb75bd6e6c3238ac Mon Sep 17 00:00:00 2001 From: Mike Lundy Date: Thu, 29 Jul 2010 00:04:29 +0200 Subject: rebase: support -X to pass through strategy options git-rebase calls out to merge strategies, but did not support merge strategy options so far. Add this, in the same style used in git-merge. Sadly we have to do the full quoting/eval dance here, since merge-recursive supports the --subtree= option which potentially contains whitespace. This patch does not cover git rebase -i, which does not call any merge strategy directly except in --preserve-merges, and even then only for merges. [jc: with a trivial fix-up for 'expr'] Signed-off-by: Mike Lundy Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- t/t3402-rebase-merge.sh | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 't/t3402-rebase-merge.sh') diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index 7b7d07269a..2bea65634a 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -74,6 +74,15 @@ test_expect_success 'rebase the other way' ' git rebase --merge side ' +test_expect_success 'rebase -Xtheirs' ' + git checkout -b conflicting master~2 && + echo "AB $T" >> original && + git commit -mconflicting original && + git rebase -Xtheirs master && + grep AB original && + ! grep 11 original +' + test_expect_success 'merge and rebase should match' ' git diff-tree -r test-rebase test-merge >difference && if test -s difference -- cgit v1.2.3