Re: [PATCH v3 15/24] read-cache: read index-v5

2013-08-23 Thread Duy Nguyen
Nit, add_part_to_conflict_entry(), create_new_conflict() and related structures/macros are not used in this patch. The first caller is in the next patch (read resolve-undo data). -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kern

Re: [PATCH v3 15/24] read-cache: read index-v5

2013-08-20 Thread Duy Nguyen
On Wed, Aug 21, 2013 at 3:59 AM, Thomas Gummerer wrote: >>> +static int read_entries(struct index_state *istate, struct directory_entry >>> *de, >>> + unsigned int first_entry_offset, void *mmap, >>> + unsigned long mmap_size, unsigned int *nr, >>> +

Re: [PATCH v3 15/24] read-cache: read index-v5

2013-08-20 Thread Thomas Gummerer
Duy Nguyen writes: > On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote: >> +static int read_entry(struct cache_entry **ce, char *pathname, size_t >> pathlen, >> + void *mmap, unsigned long mmap_size, >> + unsigned int first_entry_offset, >> +

Re: [PATCH v3 15/24] read-cache: read index-v5

2013-08-20 Thread Thomas Gummerer
Duy Nguyen writes: > General comment: a short comment before each function describing what > the function does would be helpful. This only applies for complex > functions (read_* ones). Of course verify_hdr does not require extra > explanantion. Yes, makes sense, I'll do that in the re-roll. >

Re: [PATCH v3 15/24] read-cache: read index-v5

2013-08-20 Thread Duy Nguyen
On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote: > +static int read_entry(struct cache_entry **ce, char *pathname, size_t > pathlen, > + void *mmap, unsigned long mmap_size, > + unsigned int first_entry_offset, > + unsigned int fo

Re: [PATCH v3 15/24] read-cache: read index-v5

2013-08-20 Thread Duy Nguyen
General comment: a short comment before each function describing what the function does would be helpful. This only applies for complex functions (read_* ones). Of course verify_hdr does not require extra explanantion. On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote: > +static struct dire

Re: [PATCH v3 15/24] read-cache: read index-v5

2013-08-18 Thread Eric Sunshine
On Sun, Aug 18, 2013 at 3:42 PM, Thomas Gummerer wrote: > Make git read the index file version 5 without complaining. > > This version of the reader doesn't read neither the cache-tree > nor the resolve undo data, but doesn't choke on an index that > includes such data. The double-negatives are d

[PATCH v3 15/24] read-cache: read index-v5

2013-08-18 Thread Thomas Gummerer
Make git read the index file version 5 without complaining. This version of the reader doesn't read neither the cache-tree nor the resolve undo data, but doesn't choke on an index that includes such data. Helped-by: Junio C Hamano Helped-by: Nguyen Thai Ngoc Duy Helped-by: Thomas Rast Signed-o