Re: [PATCH v2 12/19] read-cache: read index-v5

2013-08-09 Thread Thomas Gummerer
Duy Nguyen writes: > On Wed, Jul 17, 2013 at 3:11 PM, Thomas Gummerer wrote: >> Duy Nguyen writes: >> >> [..] >> +static int read_entries(struct index_state *istate, struct directory_entry **de, + unsigned int *entry_offset, void **mmap, +

Re: [PATCH v2 12/19] read-cache: read index-v5

2013-08-08 Thread Thomas Gummerer
Duy Nguyen writes: > On Wed, Jul 17, 2013 at 3:11 PM, Thomas Gummerer wrote: >> Duy Nguyen writes: >> >> [..] >> +static int read_entries(struct index_state *istate, struct directory_entry **de, + unsigned int *entry_offset, void **mmap, +

Re: [PATCH v2 12/19] read-cache: read index-v5

2013-08-07 Thread Duy Nguyen
On Wed, Aug 7, 2013 at 3:23 PM, Thomas Gummerer wrote: >> On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer >> wrote: >>> +static void ce_queue_push(struct cache_entry **head, >>> +struct cache_entry **tail, >>> +struct cache_entry *ce) >>>

Re: [PATCH v2 12/19] read-cache: read index-v5

2013-08-07 Thread Duy Nguyen
On Wed, Jul 17, 2013 at 3:11 PM, Thomas Gummerer wrote: > Duy Nguyen writes: > > [..] > >>> +static int read_entries(struct index_state *istate, struct directory_entry >>> **de, >>> + unsigned int *entry_offset, void **mmap, >>> + unsigned long mmap_si

Re: [PATCH v2 12/19] read-cache: read index-v5

2013-08-07 Thread Thomas Gummerer
Duy Nguyen writes: > A little bit more.. > > On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer > wrote: >> +static void ce_queue_push(struct cache_entry **head, >> +struct cache_entry **tail, >> +struct cache_entry *ce) >> +{ >> + if

Re: [PATCH v2 12/19] read-cache: read index-v5

2013-08-07 Thread Thomas Gummerer
Duy Nguyen writes: > On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer > wrote: >> +struct directory_entry { >> + struct directory_entry *next; >> + struct directory_entry *next_hash; >> + struct cache_entry *ce; >> + struct cache_entry *ce_last; >> + struct confli

Re: [PATCH v2 12/19] read-cache: read index-v5

2013-07-17 Thread Thomas Gummerer
Duy Nguyen writes: [..] >> +static int read_entries(struct index_state *istate, struct directory_entry >> **de, >> + unsigned int *entry_offset, void **mmap, >> + unsigned long mmap_size, unsigned int *nr, >> + unsigned int *foff

Re: [PATCH v2 12/19] read-cache: read index-v5

2013-07-15 Thread Duy Nguyen
A little bit more.. On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer wrote: > +static void ce_queue_push(struct cache_entry **head, > +struct cache_entry **tail, > +struct cache_entry *ce) > +{ > + if (!*head) { > + *hea

Re: [PATCH v2 12/19] read-cache: read index-v5

2013-07-13 Thread Duy Nguyen
On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer wrote: > +struct directory_entry { > + struct directory_entry *next; > + struct directory_entry *next_hash; > + struct cache_entry *ce; > + struct cache_entry *ce_last; > + struct conflict_entry *conflict; > + st

[PATCH v2 12/19] read-cache: read index-v5

2013-07-12 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