Merge branch 'fc/apply-p2-get-header-name'

* fc/apply-p2-get-header-name: test: git-apply -p2 rename/chmod only Fix git-apply with -p greater than 1