There is a new pull request by sgn against master on the void-packages repository https://github.com/sgn/void-packages support-git-worktree https://github.com/void-linux/void-packages/pull/21207 [RFC] Support git worktree My effort to address #20393 There's still 1 more issue. This PR haven't set `XBPS_REPOSITORY` to correct branch yet. Because I'm not sure if this direction is favourable, and it's very late in my timezone. The second patch should be fixed-up into the first patch if it's desired. A patch file from https://github.com/void-linux/void-packages/pull/21207.patch is attached