read-cache: save deleted entries in split index
Entries that belong to the base index should not be freed. Mark CE_REMOVE to track them. 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
Jun 13, 2014 at 19:19 UTC
045113a53e9e4b2c157040a1b53306d7c932c455
3 files changed
+21
-6
read-cache.c
+8
-6
@@ -39,7 +39,7 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
39
40
/* changes that can be kept in $GIT_DIR/index (basically all extensions) */
41
#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
42
- CE_ENTRY_ADDED)
42
+ CE_ENTRY_ADDED | CE_ENTRY_REMOVED)
43
44
struct index_state the_index;
45
static const char *alternate_index_output;
@@ -488,7 +488,7 @@ int remove_index_entry_at(struct index_state *istate, int pos)
488
489
record_resolve_undo(istate, ce);
490
remove_name_hash(istate, ce);
491
- free(ce);
491
+ save_or_free_index_entry(istate, ce);
492
istate->cache_changed |= CE_ENTRY_REMOVED;
493
istate->cache_nr--;
494
if (pos >= istate->cache_nr)
@@ -512,7 +512,7 @@ void remove_marked_cache_entries(struct index_state *istate)
512
for (i = j = 0; i < istate->cache_nr; i++) {
513
if (ce_array[i]->ce_flags & CE_REMOVE) {
514
remove_name_hash(istate, ce_array[i]);
515
- free(ce_array[i]);
515
+ save_or_free_index_entry(istate, ce_array[i]);
516
}
517
else
518
ce_array[j++] = ce_array[i];
@@ -577,7 +577,9 @@ static int different_name(struct cache_entry *ce, struct cache_entry *alias)
577
* So we use the CE_ADDED flag to verify that the alias was an old
578
* one before we accept it as
579
*/
580
-static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_entry *alias)
580
+static struct cache_entry *create_alias_ce(struct index_state *istate,
581
+ struct cache_entry *ce,
582
+ struct cache_entry *alias)
583
{
584
int len;
585
struct cache_entry *new;
@@ -590,7 +592,7 @@ static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_
592
new = xcalloc(1, cache_entry_size(len));
593
memcpy(new->name, alias->name, len);
594
copy_cache_entry(new, ce);
593
- free(ce);
595
+ save_or_free_index_entry(istate, ce);
596
return new;
597
}
598
@@ -683,7 +685,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
685
set_object_name_for_intent_to_add_entry(ce);
686
687
if (ignore_case && alias && different_name(ce, alias))
686
- ce = create_alias_ce(ce, alias);
688
+ ce = create_alias_ce(istate, ce, alias);
689
ce->ce_flags |= CE_ADDED;
690
691
/* It was suspected to be racily clean, but it turns out to be Ok */
split-index.c
+12
@@ -88,3 +88,15 @@ void discard_split_index(struct index_state *istate)
88
}
89
free(si);
90
}
91
+
92
+void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce)
93
+{
94
+ if (ce->index &&
95
+ istate->split_index &&
96
+ istate->split_index->base &&
97
+ ce->index <= istate->split_index->base->cache_nr &&
98
+ ce == istate->split_index->base->cache[ce->index - 1])
99
+ ce->ce_flags |= CE_REMOVE;
100
+ else
101
+ free(ce);
102
+}
split-index.h
+1
@@ -12,6 +12,7 @@ struct split_index {
12
};
13
14
struct split_index *init_split_index(struct index_state *istate);
15
+void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce);
16
int read_link_extension(struct index_state *istate,
17
const void *data, unsigned long sz);
18
int write_link_extension(struct strbuf *sb,