X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3402-rebase-merge.sh;h=7b7d07269ae35f56dd02a223f350ae0da97bae85;hb=ac083c47ea226b470afab39d975e718a475a3c78;hp=0779aaa9aba16f0f8502505b4df5cc49cfe8af82;hpb=9269df96105dff5ecc137b598ac7664d218ac6be;p=git.git diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index 0779aaa9a..7b7d07269 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -48,9 +48,14 @@ test_expect_success 'reference merge' ' git merge -s recursive "reference merge" HEAD master ' +PRE_REBASE=$(git rev-parse test-rebase) test_expect_success rebase ' git checkout test-rebase && - git rebase --merge master + GIT_TRACE=1 git rebase --merge master +' + +test_expect_success 'test-rebase@{1} is pre rebase' ' + test $PRE_REBASE = $(git rev-parse test-rebase@{1}) ' test_expect_success 'merge and rebase should match' '