mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read-cache: save deleted entries in split index

Browse Source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2014-06-13 19:19:38 +07:00
committed by Junio C Hamano
parent e0cf0d7de2
commit 045113a53e
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
read-cache.c
View File

@ -39,7 +39,7 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
/* changes that can be kept in $GIT_DIR/index (basically all extensions) */ /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \ #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
CE_ENTRY_ADDED) CE_ENTRY_ADDED | CE_ENTRY_REMOVED)
struct index_state the_index; struct index_state the_index;
static const char *alternate_index_output; static const char *alternate_index_output;
@ -488,7 +488,7 @@ int remove_index_entry_at(struct index_state *istate, int pos)
record_resolve_undo(istate, ce); record_resolve_undo(istate, ce);
remove_name_hash(istate, ce); remove_name_hash(istate, ce);
free(ce); save_or_free_index_entry(istate, ce);
istate->cache_changed |= CE_ENTRY_REMOVED; istate->cache_changed |= CE_ENTRY_REMOVED;
istate->cache_nr--; istate->cache_nr--;
if (pos >= istate->cache_nr) if (pos >= istate->cache_nr)
@ -512,7 +512,7 @@ void remove_marked_cache_entries(struct index_state *istate)
for (i = j = 0; i < istate->cache_nr; i++) { for (i = j = 0; i < istate->cache_nr; i++) {
if (ce_array[i]->ce_flags & CE_REMOVE) { if (ce_array[i]->ce_flags & CE_REMOVE) {
remove_name_hash(istate, ce_array[i]); remove_name_hash(istate, ce_array[i]);
free(ce_array[i]); save_or_free_index_entry(istate, ce_array[i]);
} }
else else
ce_array[j++] = ce_array[i]; ce_array[j++] = ce_array[i];
@ -577,7 +577,9 @@ static int different_name(struct cache_entry *ce, struct cache_entry *alias)
* So we use the CE_ADDED flag to verify that the alias was an old * So we use the CE_ADDED flag to verify that the alias was an old
* one before we accept it as * one before we accept it as
*/ */
static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_entry *alias) static struct cache_entry *create_alias_ce(struct index_state *istate,
struct cache_entry *ce,
struct cache_entry *alias)
{ {
int len; int len;
struct cache_entry *new; struct cache_entry *new;
@ -590,7 +592,7 @@ static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_
new = xcalloc(1, cache_entry_size(len)); new = xcalloc(1, cache_entry_size(len));
memcpy(new->name, alias->name, len); memcpy(new->name, alias->name, len);
copy_cache_entry(new, ce); copy_cache_entry(new, ce);
free(ce); save_or_free_index_entry(istate, ce);
return new; return new;
} }
@ -683,7 +685,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
set_object_name_for_intent_to_add_entry(ce); set_object_name_for_intent_to_add_entry(ce);
if (ignore_case && alias && different_name(ce, alias)) if (ignore_case && alias && different_name(ce, alias))
ce = create_alias_ce(ce, alias); ce = create_alias_ce(istate, ce, alias);
ce->ce_flags |= CE_ADDED; ce->ce_flags |= CE_ADDED;
/* It was suspected to be racily clean, but it turns out to be Ok */ /* It was suspected to be racily clean, but it turns out to be Ok */

12
split-index.c
View File

@ -88,3 +88,15 @@ void discard_split_index(struct index_state *istate)
} }
free(si); free(si);
} }
void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce)
{
if (ce->index &&
istate->split_index &&
istate->split_index->base &&
ce->index <= istate->split_index->base->cache_nr &&
ce == istate->split_index->base->cache[ce->index - 1])
ce->ce_flags |= CE_REMOVE;
else
free(ce);
}

1
split-index.h
View File

@ -12,6 +12,7 @@ struct split_index {
}; };
struct split_index *init_split_index(struct index_state *istate); struct split_index *init_split_index(struct index_state *istate);
void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce);
int read_link_extension(struct index_state *istate, int read_link_extension(struct index_state *istate,
const void *data, unsigned long sz); const void *data, unsigned long sz);
int write_link_extension(struct strbuf *sb, int write_link_extension(struct strbuf *sb,