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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Shawn Pearce <spearce@xxxxxxxxxxx> 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.


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]