Putting this here to remind us to fix this, after discussion in libgit2/libgit2#3935 (comment) settles on a reasonable modification to that pull request. This will involve editing the locally-carried patch to libgit2.