proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-27 20:03:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3493 from ethomson/read_index

Browse Source 
index: read_index must update hashes
This commit is contained in:
Carlos Martín Nieto 2015-10-30 19:36:16 +01:00
commit d571a54e60
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/index.c
View File

@ -2899,6 +2899,7 @@ int git_index_read_index(
{ {
git_vector new_entries = GIT_VECTOR_INIT, git_vector new_entries = GIT_VECTOR_INIT,
remove_entries = GIT_VECTOR_INIT; remove_entries = GIT_VECTOR_INIT;
git_idxmap *new_entries_map = NULL;
git_iterator *index_iterator = NULL; git_iterator *index_iterator = NULL;
git_iterator *new_iterator = NULL; git_iterator *new_iterator = NULL;
git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT; git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT;
@ -2908,9 +2909,15 @@ int git_index_read_index(
int error; int error;
if ((error = git_vector_init(&new_entries, new_index->entries.length, index->entries._cmp)) < 0 || if ((error = git_vector_init(&new_entries, new_index->entries.length, index->entries._cmp)) < 0 ||
(error = git_vector_init(&remove_entries, index->entries.length, NULL)) < 0) (error = git_vector_init(&remove_entries, index->entries.length, NULL)) < 0 ||
(error = git_idxmap_alloc(&new_entries_map)) < 0)
goto done; goto done;
if (index->ignore_case)
kh_resize(idxicase, (khash_t(idxicase) *) new_entries_map, new_index->entries.length);
else
kh_resize(idx, new_entries_map, new_index->entries.length);
opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE;
if ((error = git_iterator_for_index(&index_iterator, index, &opts)) < 0 || if ((error = git_iterator_for_index(&index_iterator, index, &opts)) < 0 ||
@ -2924,6 +2931,7 @@ int git_index_read_index(
goto done; goto done;
while (true) { while (true) {
git_index_entry *add_entry = NULL, *remove_entry = NULL;
int diff; int diff;
if (old_entry && new_entry) if (old_entry && new_entry)
@ -2936,27 +2944,37 @@ int git_index_read_index(
break; break;
if (diff < 0) { if (diff < 0) {
git_vector_insert(&remove_entries, (git_index_entry *)old_entry); remove_entry = (git_index_entry *)old_entry;
} else if (diff > 0) { } else if (diff > 0) {
if ((error = index_entry_dup(&entry, index, new_entry)) < 0) if ((error = index_entry_dup(&add_entry, index, new_entry)) < 0)
goto done; goto done;
git_vector_insert(&new_entries, entry);
} else { } else {
/* Path and stage are equal, if the OID is equal, keep it to /* Path and stage are equal, if the OID is equal, keep it to
* keep the stat cache data. * keep the stat cache data.
*/ */
if (git_oid_equal(&old_entry->id, &new_entry->id)) { if (git_oid_equal(&old_entry->id, &new_entry->id)) {
git_vector_insert(&new_entries, (git_index_entry *)old_entry); add_entry = (git_index_entry *)old_entry;
} else { } else {
if ((error = index_entry_dup(&entry, index, new_entry)) < 0) if ((error = index_entry_dup(&add_entry, index, new_entry)) < 0)
goto done; goto done;
git_vector_insert(&new_entries, entry); remove_entry = (git_index_entry *)old_entry;
git_vector_insert(&remove_entries, (git_index_entry *)old_entry);
} }
} }
if (add_entry) {
if ((error = git_vector_insert(&new_entries, add_entry)) == 0)
INSERT_IN_MAP_EX(index, new_entries_map, add_entry, error);
}
if (remove_entry && !error)
error = git_vector_insert(&remove_entries, remove_entry);
if (error < 0) {
giterr_set(GITERR_INDEX, "failed to insert entry");
return error;
}
if (diff <= 0) { if (diff <= 0) {
if ((error = git_iterator_advance(&old_entry, index_iterator)) < 0 && if ((error = git_iterator_advance(&old_entry, index_iterator)) < 0 &&
error != GIT_ITEROVER) error != GIT_ITEROVER)
@ -2974,6 +2992,7 @@ int git_index_read_index(
git_index_reuc_clear(index); git_index_reuc_clear(index);
git_vector_swap(&new_entries, &index->entries); git_vector_swap(&new_entries, &index->entries);
new_entries_map = git__swap(index->entries_map, new_entries_map);
git_vector_foreach(&remove_entries, i, entry) { git_vector_foreach(&remove_entries, i, entry) {
if (index->tree) if (index->tree)
@ -2985,6 +3004,7 @@ int git_index_read_index(
error = 0; error = 0;
done: done:
git_idxmap_free(new_entries_map);
git_vector_free(&new_entries); git_vector_free(&new_entries);
git_vector_free(&remove_entries); git_vector_free(&remove_entries);
git_iterator_free(index_iterator); git_iterator_free(index_iterator);