Merge branch 'pw/add-p-single'

Hotfix. * pw/add-p-single: add -p: fix 2.17.0-rc* regression due to moved code

Junio C Hamano committed Apr 2, 2018 at 10:10 UTC 5f9441769fab51afc9fc96d1e5f7a9edde586088

No changes.