Fix git within a git problem