Fix git-apply with -p greater than 1