From: Alex Riesen <raa.lkml@gmail.com>
To: "Björn Steinbrink" <B.Steinbrink@gmx.de>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: git blame crashes with internal error
Date: Sun, 14 Oct 2007 18:37:02 +0200 [thread overview]
Message-ID: <20071014163702.GA2776@steel.home> (raw)
In-Reply-To: <20071014143628.GA22568@atjola.homenet>
Björn Steinbrink, Sun, Oct 14, 2007 16:36:28 +0200:
> Hi Junio,
>
> git blame just decided to crash on me, when I tried to use it while
> resolving a merge conflict. Interesting is probably, that it crashes
> when given the filename of a file that is not _directly_ affected by the
> merge, but contains code that originates from a file that caused
> conlicts.
>
> Error message is:
> fatal: internal error: ce_mode is 0
>
It is not crashing. It is just not handling unexpected situation
properly:
$ testcase.sh
...
Switched to branch "foo"
CONFLICT (delete/modify): file1 deleted in HEAD and modified in master. Version master of file1 left in tree.
Automatic merge failed; fix conflicts and then commit the result.
fatal: internal error: ce_mode is 0
$ git ls-files --cached --stage
100644 72139f38953679bd19b3a7938c479d73c1aa7b59 1 file1
100644 3181f904ce3f9364b08524edd262a7a2ac766c9c 3 file1
100644 24e1ea80d6dcc497f60597b2a6d7cf65ecaa958a 0 file2
See? There is an unresolved merge.
The question is, what's the problem...
next prev parent reply other threads:[~2007-10-14 16:37 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
2007-10-14 16:37 ` Alex Riesen [this message]
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=20071014163702.GA2776@steel.home \
--to=raa.lkml@gmail.com \
--cc=B.Steinbrink@gmx.de \
--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).