On Mon, Apr 29, 2019 at 6:03 PM Aleksey Midenkov <midenok@xxxxxxxxx> wrote: > > Reproduce: > ``` > cat << EOF >> /tmp/check.sh > #!/bin/sh > git log HEAD~..HEAD | cat > # sleep 1 > EOF > chmod +x /tmp/check.sh > git rebase -p -x /tmp/check.sh base > ``` > If the `base` is far away enough it fails with "fatal: Unable to > create '.../.git/index.lock': File exists." at an arbitrary commit. I gave it about 2000 commits (from v2.20.1 to master on git.git) to rebase. No luck. This --preserve-merges is being completely replaced in latest git version though. Is it possible for you to try master branch of git.git and see if the problem is still there? > > Abort current rebase, uncomment 'sleep 1' and repeat rebase. Now it > doesn't fail. > > Version: > git version 2.20.1 > > uname --all > Linux lian 4.18.0-15-generic #16-Ubuntu SMP Thu Feb 7 10:56:39 UTC > 2019 x86_64 x86_64 x86_64 GNU/Linux > > > -- > All the best, > > Aleksey Midenkov > @midenok -- Duy
