From: Junio C Hamano <junkio@cox.net>
To: Shawn Pearce <spearce@spearce.org>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: Bug in merge-recursive in virtual commit corner case
Date: Thu, 07 Dec 2006 22:01:52 -0800 [thread overview]
Message-ID: <7vd56vorhr.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20061207192401.GB12143@spearce.org> (Shawn Pearce's message of "Thu, 7 Dec 2006 14:24:01 -0500")
Shawn Pearce <spearce@spearce.org> writes:
> Although Junio mentioned he recently saw something like this in
> git.git when he merged in your xdl_merge() code. I wonder if its
> the same issue.
No, that is not related at all. My initial attempt (which is
not in any commit that survives til today) used hash_sha1_file()
on the result from xdl_merge() where I should have used
write_sha1_file(), and I saw the same "oh, the required object
is not there" errors from everywhere.
prev parent reply other threads:[~2006-12-08 6:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-07 8:35 Bug in merge-recursive in virtual commit corner case Shawn Pearce
2006-12-07 9:13 ` Junio C Hamano
2006-12-07 15:38 ` Johannes Schindelin
2006-12-07 19:24 ` Shawn Pearce
2006-12-08 3:03 ` Johannes Schindelin
2006-12-08 6:01 ` Junio C Hamano [this message]
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=7vd56vorhr.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/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.