From: Eric Sunshine <sunshine@sunshineco.com>
To: Jeff King <peff@peff.net>
Cc: Edmundo Carmona Antoranz <eantoranz@gmail.com>,
Git List <git@vger.kernel.org>, Max Kirillov <max@max630.net>
Subject: Re: [PATCH v2] blame: avoid checking if a file exists on the working tree if a revision is provided
Date: Tue, 17 Nov 2015 18:01:25 -0500 [thread overview]
Message-ID: <CAPig+cQcmtZJmm_FGMNL4OCTgdFZGyLjVrwbfCCp+0kwBeFuRQ@mail.gmail.com> (raw)
In-Reply-To: <20151117224809.GE27862@sigill.intra.peff.net>
On Tue, Nov 17, 2015 at 5:48 PM, Jeff King <peff@peff.net> wrote:
> On Tue, Nov 17, 2015 at 12:11:25AM -0500, Eric Sunshine wrote:
>> > blame content even if the path provided does match an existing
>> > blob on said revision.
>>
>> git-blame documentation does not advertise "blame <file> <rev>" as a
>> valid invocation. It does advertise "blame <rev> -- <file>", and this
>> case already works correctly even when <file> does not exist in the
>> worktree.
>
> Hmm. Out of curiosity I tried:
>
> git blame v2.4.0 -- t/t6031-merge-recursive.sh
>
> and it segfaults. This bisects to Max's recent 1b0d400 (blame: extract
> find_single_final, 2015-10-30), but I do not see anything obviously
> wrong with it from a quick glance.
In the original code, sb->final received was assigned value of obj,
which may have gone through deref_tag(), however, after 1b0d400,
sb->final is unconditionally assigned the original value of obj, not
the (potentially) deref'd value.
next prev parent reply other threads:[~2015-11-17 23:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-17 1:29 [PATCH v2] blame: avoid checking if a file exists on the working tree if a revision is provided Edmundo Carmona Antoranz
2015-11-17 5:11 ` Eric Sunshine
2015-11-17 22:48 ` Jeff King
2015-11-17 23:00 ` Stefan Beller
2015-11-17 23:01 ` Eric Sunshine [this message]
2015-11-17 23:22 ` Jeff King
2015-11-20 4:38 ` Eric Sunshine
2015-11-17 23:37 ` Edmundo Carmona Antoranz
2015-11-17 23:47 ` Edmundo Carmona Antoranz
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPig+cQcmtZJmm_FGMNL4OCTgdFZGyLjVrwbfCCp+0kwBeFuRQ@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=eantoranz@gmail.com \
--cc=git@vger.kernel.org \
--cc=max@max630.net \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).