I was able to workaround this bug with a "git gc" invocation. On Sun, Feb 7, 2021 at 11:28 PM Filippo Valsorda <valsorda@xxxxxxxxxx> wrote: > > What did you do before the bug happened? (Steps to reproduce your issue) > > $ git merge origin/master > > > What happened instead? (Actual behavior) > > BUG: commit-reach.c:66: bad generation skip ad18 > 7 at > be28e5abc5ddca0d6b2d8c91b7bb9c05717154e7 > > > Anything else you want to add: > > Running in a worktree of a clone of https://go.googlesource.com/go. > HEAD is 0d34d85dee216b62a4212d25de57e1119c1e7ee5, branch is > filippo/boringcrypto/16, > tracking and matching origin/dev.boringcrypto. > origin/master is 724d0720b3e110f64598bf789cbe2a6a1b3b0fd8. > > > [System Info] > git version: > git version 2.30.0 > cpu: x86_64 > no commit associated with this build > sizeof-long: 8 > sizeof-size_t: 8 > shell-path: /bin/sh > uname: Darwin 20.3.0 Darwin Kernel Version 20.3.0: Mon Dec 7 22:04:02 > PST 2020; root:xnu-7195.80.16.111.1~1/RELEASE_X86_64 x86_64 > compiler info: clang: 12.0.0 (clang-1200.0.32.28) > libc info: no libc information available > $SHELL (typically, interactive shell): /Users/valsorda/homebrew/bin/zsh > > > [Enabled Hooks] > pre-commit > commit-msg