From: "Shawn O. Pearce" <spearce@spearce.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: [PATCH] pretend-sha1: grave bugfix.
Date: Fri, 16 Feb 2007 00:09:43 -0500 [thread overview]
Message-ID: <20070216050943.GD28894@spearce.org> (raw)
In-Reply-To: <Pine.LNX.4.63.0702160503290.22628@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Thu, 15 Feb 2007, Junio C Hamano wrote:
>
> > * I wonder how recent merge-recursive with multiple merge bases
> > (or an empty one) ever worked with this bug. Am I
> > hallucinating?
>
> Probably the fact helped that merge-recursive only pretends
> zero-sized blobs.
Most definately. We never look at the pointer to an object's data if
len == 0, which it does in this case of merge-recursive's empty tree.
Aren't we using this for git-blame --contents? How'd that ever
work for a non-empty file?
--
Shawn.
next prev parent reply other threads:[~2007-02-16 5:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-16 1:16 [PATCH] pretend-sha1: grave bugfix Junio C Hamano
2007-02-16 4:05 ` Johannes Schindelin
2007-02-16 5:09 ` Shawn O. Pearce [this message]
2007-02-16 7:29 ` Junio C Hamano
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=20070216050943.GD28894@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.