Merge branch 'js/checkout-p-new-file'

"git checkout -p" did not handle a newly added path at all. * js/checkout-p-new-file: checkout -p: handle new files correctly