Re: [PATCH 2/2] fast-import: add special '-' blob reference to use the previous one.
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:45:48
Felipe Contreras [off-list ref] wrote:
quoted hunk ↗ jump to hunk
@@ -1862,7 +1864,7 @@ static void file_change_m(struct branch *b) const char *endp; struct object_entry *oe = oe; unsigned char sha1[20]; - uint16_t mode, inline_data = 0; + uint16_t mode, inline_data = 0, empty_blob = 0;
Its not the empty blob, its the inherited/assumed blob...
quoted hunk ↗ jump to hunk
@@ -1893,6 +1895,10 @@ static void file_change_m(struct branch *b) } else if (!prefixcmp(p, "inline")) { inline_data = 1; p += 6; + } else if (!prefixcmp(p, "- ")) { + hashclr(sha1); + empty_blob = 1; + p += 1;
Hmph, so if create a new path with a blob of "-" the repository will be corrupt because the zero id was used and error was produced. Actually I think you have the same bug in the prior patch with the mode being inherited. I wonder if we shouldn't put error checking in too to validate that versions[0] describes a file entry. -- Shawn.