cache-tree: fix writing cache-tree when CE_REMOVE is present
entry_count is used in update_one() for two purposes: 1. to skip through the number of processed entries in in-memory index 2. to record the number of entries this cache-tree covers on disk Unfortunately when CE_REMOVE is present these numbers are not the same because CE_REMOVE entries are automatically removed before writing to disk but entry_count is not adjusted and still counts CE_REMOVE entries. Separate the two use cases into two different variables. #1 is taken care by the new field count in struct cache_tree_sub and entry_count is prepared for #2. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Dec 16, 2012 at 11:15 UTC
3cf773e4264ecc6e9f603a24aeb72cc68b372f96
2 files changed
+24
-7
cache-tree.c
+23
-7
@@ -238,6 +238,7 @@ static int update_one(struct cache_tree *it,
238
int entries,
239
const char *base,
240
int baselen,
241
+ int *skip_count,
242
int flags)
243
{
244
struct strbuf buffer;
@@ -245,6 +246,8 @@ static int update_one(struct cache_tree *it,
246
int dryrun = flags & WRITE_TREE_DRY_RUN;
247
int i;
248
249
+ *skip_count = 0;
250
+
251
if (0 <= it->entry_count && has_sha1_file(it->sha1))
252
return it->entry_count;
253
@@ -264,7 +267,7 @@ static int update_one(struct cache_tree *it,
267
struct cache_entry *ce = cache[i];
268
struct cache_tree_sub *sub;
269
const char *path, *slash;
267
- int pathlen, sublen, subcnt;
270
+ int pathlen, sublen, subcnt, subskip;
271
272
path = ce->name;
273
pathlen = ce_namelen(ce);
@@ -289,10 +292,13 @@ static int update_one(struct cache_tree *it,
292
cache + i, entries - i,
293
path,
294
baselen + sublen + 1,
295
+ &subskip,
296
flags);
297
if (subcnt < 0)
298
return subcnt;
299
i += subcnt;
300
+ sub->count = subcnt; /* to be used in the next loop */
301
+ *skip_count += subskip;
302
sub->used = 1;
303
}
304
@@ -324,7 +330,7 @@ static int update_one(struct cache_tree *it,
330
if (!sub)
331
die("cache-tree.c: '%.*s' in '%s' not found",
332
entlen, path + baselen, path);
327
- i += sub->cache_tree->entry_count;
333
+ i += sub->count;
334
sha1 = sub->cache_tree->sha1;
335
mode = S_IFDIR;
336
}
@@ -340,8 +346,18 @@ static int update_one(struct cache_tree *it,
346
mode, sha1_to_hex(sha1), entlen+baselen, path);
347
}
348
343
- if (ce->ce_flags & (CE_REMOVE | CE_INTENT_TO_ADD))
344
- continue; /* entry being removed or placeholder */
349
+ /*
350
+ * CE_REMOVE entries are removed before the index is
351
+ * written to disk. Skip them to remain consistent
352
+ * with the future on-disk index.
353
+ */
354
+ if (ce->ce_flags & CE_REMOVE) {
355
+ *skip_count = *skip_count + 1;
356
+ continue;
357
+ }
358
+
359
+ if (ce->ce_flags & CE_INTENT_TO_ADD)
360
+ continue;
361
362
strbuf_grow(&buffer, entlen + 100);
363
strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
@@ -361,7 +377,7 @@ static int update_one(struct cache_tree *it,
377
}
378
379
strbuf_release(&buffer);
364
- it->entry_count = i;
380
+ it->entry_count = i - *skip_count;
381
#if DEBUG
382
fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
383
it->entry_count, it->subtree_nr,
@@ -375,11 +391,11 @@ int cache_tree_update(struct cache_tree *it,
391
int entries,
392
int flags)
393
{
378
- int i;
394
+ int i, skip;
395
i = verify_cache(cache, entries, flags);
396
if (i)
397
return i;
382
- i = update_one(it, cache, entries, "", 0, flags);
398
+ i = update_one(it, cache, entries, "", 0, &skip, flags);
399
if (i < 0)
400
return i;
401
return 0;
cache-tree.h
+1
@@ -7,6 +7,7 @@
7
struct cache_tree;
8
struct cache_tree_sub {
9
struct cache_tree *cache_tree;
10
+ int count; /* internally used by update_one() */
11
int namelen;
12
int used;
13
char name[FLEX_ARRAY];