Merge branch 'dl/checkout-p-merge-base'

Fix to a regression introduced during this cycle. * dl/checkout-p-merge-base: checkout -p: handle tree arguments correctly again