Go back to using flat files for locking but keep them in the repo-specific GIT_DIR.
drwxr-xr-x - client
drwxr-xr-x - scripts
drwxr-xr-x - server
drwxr-xr-x - tests