git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Paul Ganssle <paul@ganssle.io>
To: git@vger.kernel.org
Subject: Segfault when rebasing with --autosquash
Date: Sat, 2 May 2020 21:22:09 -0400	[thread overview]
Message-ID: <017dbc40-8d21-00fb-7b0e-6708d2dcb366@ganssle.io> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 1483 bytes --]

Hi all,

I have recently been using the git absorb
<https://github.com/tummychow/git-absorb> tool to automatically split up
various minor adjustments to my branches into the right fixup commits,
which I then autosquash at the very end. This has worked very well for
the most part, but twice now it has managed to get into a state where
`git rebase -i --autosquash` leads to a segfault in git. This may also
be a bug in `git absorb`, but I think the segfault must at least be a
bug in git.

Unfortunately, I have been unable to /deliberately/ create a repository
that exhibits this behavior using `git absorb`, but last time it
happened I created a fork of my repo and trimmed out as many commits as
I could while still exhibiting the behavior, you can find it here, along
with instructions on how to trigger the bug:
https://github.com/pganssle-bug-mwes/git_autosquash_bug_mwe

I'll also note that I have confirmed that a fresh clone, git gc and git
prune do not help here. It's easy enough to work around — just do an
interactive rebase without --autosquash and manually squash in any
commits that say `fixup <commit_id>` instead of `fixup <commit_message>`
and you will get back into a state where --autosquash works.

Please do let me know if anyone comes up with a better diagnosis for
this (there may be an associated bug in git absorb, and knowing more
about this bug might elucidate where that could come in from git absorb).

Thanks!
Paul



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

             reply	other threads:[~2020-05-03  1:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-03  1:22 Paul Ganssle [this message]
2020-05-03  7:31 ` Segfault when rebasing with --autosquash Jeff King

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=017dbc40-8d21-00fb-7b0e-6708d2dcb366@ganssle.io \
    --to=paul@ganssle.io \
    --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).