Relocated get_git_dir logic to function, enabled merge in progress test, and everything looks good