Re: segfault with git rebase --abort

From: Wolfgang Rohdewald <wolfgang@rohdewald.de>
Date: Mar 24, 2024, 22:56 UTC
Message-ID: <7df26e3813ef76ee90c1fb02847bbb4b9bad630d.camel@rohdewald.de>
In-Reply-To: <xmqqle67pa7a.fsf@gitster.g>

Am Sonntag, dem 24.03.2024 um 14:54 -0700 schrieb Junio C Hamano:

Show 17 quoted lines

> Wolfgang Rohdewald <wolfgang@rohdewald.de> writes:
> 
> > git rebase -i
> > 
> > git rebase --abort # boom
> > 
> This thread _might_ be relevant.
> 
>   https://lore.kernel.org/git/20240218114936.1121077-1-marcel@roethke.info/
> 
> The "might" is because the symptom is a sign of corruption of the
> rerere database but the discussion or the patch in there do not know
> how such a corruption happened in the first place.
> 
> If you rebuild Git with Marcel's patch (there is v2 downthread, and
> we have been waiting for a v3) and it improves the situation, please
> do let us know.

Yes, the patch resolved my problem. Thanks a lot!

From the bash history below, this might be the sequence:

(git 2.39)

I think I forgot to remove one line of "<<<<<<< HEAD" before doing the first git add.

Because git rebase --abort then told me about the lockfile, the segfault probably already happened with the second git rebase --continue. and from then on all git rebase --abort segfaulted.

Oh - and I definitively did not mess around in .git

I do have a backup of the repo, so if you want me to look up things ...

git checkout master git rebase -i vi servertable.py git add servertable.py # here I probably left that <<<< HEAD line git rebase --continue vi servertable.py git add servertable.py git rebase --continue # I think this already segfaulted git status df # plenty of free space git rebase --abort rm .git/MERGE_RR.lock

Since the patch is about rerere, I now did:

wrpc:~/tmp/kajongg (master|REBASE-i) git rerere status src/servertable.py wrpc:~/tmp/kajongg (master|REBASE-i) git rerere diff error: Could not stat .git/rr-cache/a8ec6f624ee23ef2e37148a8172ebac3c6639f93/preimage: No such file or directory fatal: unable to generate diff for '.git/rr-cache/a8ec6f624ee23ef2e37148a8172ebac3c6639f93'

wrpc:~/tmp/kajongg/.git/rr-cache (GIT_DIR!|REBASE-i) ls -lrt | tail -3 drwxr-xr-x 2 wr wr 4096 Mar 24 16:19 e6c7ce944f313fa718cad6875d4ee784c098868c drwxr-xr-x 2 wr wr 4096 Mar 24 16:19 d0a20608fa0aafd2b234cce432ce7af567c1a94a drwxr-xr-x 2 wr wr 4096 Mar 24 16:43 a8ec6f624ee23ef2e37148a8172ebac3c6639f93 wrpc:~/tmp/kajongg/.git/rr-cache (GIT_DIR!|REBASE-i) ls -l a8ec6f624ee23ef2e37148a8172ebac3c6639f93/ total 0

-- 
mit freundlichen Grüssen

Wolfgang Rohdewald