Thread (1 message) 1 message, 1 author, 2016-08-11

Re: Bug in merge-recursive in virtual commit corner case

From: Junio C Hamano <hidden>
Date: 2016-08-11 19:41:03

Shawn Pearce [off-list ref] 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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help