git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Taylor Blau <me@ttaylorr.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Elijah Newren <newren@gmail.com>
Subject: Re: [BUG] seemingly-rare segfault in merge-tree
Date: Tue, 20 Sep 2022 16:59:04 -0400	[thread overview]
Message-ID: <YyopmKNZU4WL2wrV@nand.local> (raw)
In-Reply-To: <YyopQD+LvPucnz3w@nand.local>

On Tue, Sep 20, 2022 at 04:57:36PM -0400, Taylor Blau wrote:
>   #1  0x000056234188aba3 in real_merge (prefix=0x0, branch2=<optimized out>,
>       branch1=<optimized out>, o=0x7ffd3fc4cd60) at builtin/merge-tree.c:528
>   528	builtin/merge-tree.c: No such file or directory.

I should mention, of course, that this line is custom to GitHub's fork,
and so doesn't match with the latest on `master`. Here's a link to the
relevant call that matches up:

  https://github.com/git/git/blob/dda7228a83e2e9ff584bf6adbf55910565b41e14/builtin/merge-tree.c#L449

Thanks,
Taylor

  reply	other threads:[~2022-09-20 20:59 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-20 20:57 [BUG] seemingly-rare segfault in merge-tree Taylor Blau
2022-09-20 20:59 ` Taylor Blau [this message]
2022-09-20 21:24   ` Johannes Schindelin
2022-09-20 21:57     ` Taylor Blau

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=YyopmKNZU4WL2wrV@nand.local \
    --to=me@ttaylorr.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    /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).