From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Björn Steinbrink" <B.Steinbrink@gmx.de>
Cc: Andreas Ericsson <ae@op5.se>, gitster@pobox.com, git@vger.kernel.org
Subject: Re: git blame crashes with internal error
Date: Sun, 14 Oct 2007 21:21:00 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0710142118590.25221@racer.site> (raw)
In-Reply-To: <20071014201813.GA26872@atjola.homenet>
Hi,
On Sun, 14 Oct 2007, Bj?rn Steinbrink wrote:
> On 2007.10.14 18:32:44 +0100, Johannes Schindelin wrote:
> >
> > On Sun, 14 Oct 2007, Bj?rn Steinbrink wrote:
> >
> > > On 2007.10.14 16:51:46 +0200, Andreas Ericsson wrote:
> > > > Bj?rn Steinbrink wrote:
> > > >> I tried all git releases from 1.5.3 to 1.5.3.4 as well as the current
> > > >> master and all of them crashed. A small shell script to reproduce the
> > > >> problem is attached.
> > > >
> > > > Manual bisect? Ugh. This *is* the century of the competent developer
> > > > tools, you know... ;-)
> > >
> > > Then, how do I search for a good version with git bisect if I only have
> > > the one data-point "master is bad"?
> >
> > AFAIK Junio introduced the option to start with just a bad commit, and no
> > known "good" one.
> >
> > Yep, just found it. Since v1.5.2-rc0~77^2(git-bisect: allow bisecting
> > with only one bad commit.) it is supported.
> >
> > >From the commit message:
> >
> > This allows you to say:
> >
> > git bisect start
> > git bisect bad $bad
> > git bisect next
>
> OK, using that approach, I bisected it, and even found a "guilty"
> commit, although it is pretty much useless:
>
> 1cfe77333f274c9ba9879c2eb61057a790eb050f is first bad commit
> commit 1cfe77333f274c9ba9879c2eb61057a790eb050f
> Author: Junio C Hamano <junkio@cox.net>
> Date: Tue Jan 30 01:11:08 2007 -0800
>
> git-blame: no rev means start from the working tree file.
I think it is not useless. It says exactly the same as I did, in another
reply: git blame starts with your working tree. As such, it has to do
some operations which happen to fail on unmerged files.
So the solution in your case _really_ is:
git blame HEAD file2
Explanation: with that command line, you ask git blame to start with a
given revision (instead of the working tree), which just so happens to be
the HEAD revision.
Hth,
Dscho
next prev parent reply other threads:[~2007-10-14 20:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-14 14:36 git blame crashes with internal error Björn Steinbrink
2007-10-14 14:51 ` Andreas Ericsson
2007-10-14 14:56 ` David Kastrup
2007-10-14 16:50 ` Pierre Habouzit
2007-10-14 15:23 ` Björn Steinbrink
2007-10-14 17:32 ` Johannes Schindelin
2007-10-14 20:18 ` Björn Steinbrink
2007-10-14 20:21 ` Johannes Schindelin [this message]
2007-10-14 16:37 ` Alex Riesen
2007-10-14 17:33 ` Alex Riesen
2007-10-14 17:51 ` Johannes Schindelin
2007-10-15 15:39 ` Linus Torvalds
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=Pine.LNX.4.64.0710142118590.25221@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=B.Steinbrink@gmx.de \
--cc=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).