Merge branches 'fix-git-for-gitdir-file' and 'reporootlocal-cmd'