From: Wolfgang Rohdewald <wolfgang@rohdewald.de>
To: git@vger.kernel.org
Subject: segfault with git rebase --abort
Date: Sun, 24 Mar 2024 19:28:21 +0100 [thread overview]
Message-ID: <88a694de4a7f767613475ef1d19292a69eaccb07.camel@rohdewald.de> (raw)
git rebase -i
git rebase --abort # boom
git status only shows changes to be committed
I can mail or upload the git archive, that would be 230MB
git fsck;git repack;git prune;git gc does not help
Happens with git 2.39 and with latest git commit 11c821f2f2a31e70fb5cc449f9a29401c333aad2, compiled with -g -O0
gdb:
Starting program: /home/wr/bin/git rebase --abort
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
Program received signal SIGSEGV, Segmentation fault.
0x00005555557ef89a in has_rerere_resolution (id=0x5555559f5950) at rerere.c:167
167 return ((id->collection->status[variant] & both) == both);
(gdb) bt
#0 0x00005555557ef89a in has_rerere_resolution (id=0x5555559f5950) at rerere.c:167
#1 0x00005555557f249c in rerere_clear (r=0x5555559ea220 <the_repo>, merge_rr=0x7fffffffc0a0) at rerere.c:1249
#2 0x000055555562388e in cmd_rebase (argc=0, argv=0x7fffffffd8b0, prefix=0x0) at builtin/rebase.c:1315
#3 0x0000555555574b71 in run_builtin (p=0x5555559b6010 <commands+2256>, argc=2, argv=0x7fffffffd8b0) at git.c:469
#4 0x0000555555574f8c in handle_builtin (argc=2, argv=0x7fffffffd8b0) at git.c:724
#5 0x00005555555751b0 in run_argv (argcp=0x7fffffffd71c, argv=0x7fffffffd710) at git.c:788
#6 0x0000555555575724 in cmd_main (argc=2, argv=0x7fffffffd8b0) at git.c:923
#7 0x0000555555673c7a in main (argc=3, argv=0x7fffffffd8a8) at common-main.c:62
(gdb) p id->collection->status
$2 = (unsigned char *) 0x0
(gdb) p *(id->collection)
$3 = {status_alloc = 0, status_nr = 0, status = 0x0, name = 0x5555559f5e80 "a8ec6f624ee23ef2e37148a8172ebac3c6639f93"}
there is no file named a8ec6f624ee23ef2e37148a8172ebac3c6639f93
[System Info]
git version:
git version 2.44.GIT
cpu: x86_64
no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh
uname: Linux 6.6.22-25 #1 SMP PREEMPT_DYNAMIC Sun Mar 17 12:35:12 CET 2024 x86_64
compiler info: gnuc: 12.2
libc info: glibc: 2.36
$SHELL (typically, interactive shell): /bin/bash
[Enabled Hooks]
--
mit freundlichen Grüssen
Wolfgang Rohdewald
next reply other threads:[~2024-03-24 18:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-24 18:28 Wolfgang Rohdewald [this message]
2024-03-24 21:54 ` segfault with git rebase --abort Junio C Hamano
2024-03-24 22:56 ` Wolfgang Rohdewald
2024-03-25 20:46 ` Junio C Hamano
2024-04-06 20:21 ` Marcel Röthke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=88a694de4a7f767613475ef1d19292a69eaccb07.camel@rohdewald.de \
--to=wolfgang@rohdewald.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).