Thanks for the investigation @jkylling ! Not the most elegant fix, but practical and does seem to solve the issue

Do you have better suggestions @xkrogen?

I took a quick read through the Details section for git-worktree and the worktree-related stuff in gitrepository-layout. It seems like this should work if we assume the GIT_DIR and GIT_COMMON_DIR environment variables aren't set. Not sure if we should consider them here?

There is also the potential situation where .git is a text file containing a gitpath spec, instead of a directory. Also not sure if git-commit-id handles this situation generally; if so, should we also handle that here?

@TheSnoozer I've gone through the contributor checklist and fixed the check style violations. Do you think we should merge this?

Thanks again for your contribution! Merged now.

Hey @TheSnoozer just curious when you expect this to go into a release? I'm not familiar with the release lifecycle of this project, just wondering when I'll be able to adopt it downstream.

Big thanks to both of you btw :)

The release cycle is to wait until someone mentions they want a release ;-)

Will do that as soon as I have time (sorry this project is still only my free time) :-)

Released now as 7.0.0 via #623.

Heh awesome ... Thanks so much @TheSnoozer !