Merge branch 'sp/sh-windows-pwd' * sp/sh-windows-pwd: git-sh-setup: define workaround wrappers before they are used