proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-07 10:46:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Two-phase index merging

Browse Source 
When three-way merging indexes, we previously changed each path
as we read them, which would lead to us adding an index entry for
'foo', then removing an index entry for 'foo/file'.  With the new
index requirements, this is not allowed.  Removing entries in the
merged index, then adding them, resolves this.  In the previous
example, we now remove 'foo/file' before adding 'foo'.
This commit is contained in:
Edward Thomson 2014-01-29 13:14:00 -08:00
parent b747eb1445
commit 0972c59205
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/merge.c
View File

@ -2398,12 +2398,21 @@ int git_merge__indexes(git_repository *repo, git_index *index_new)
goto done; goto done;
} }
/* Update the new index */ /* Remove removed items from the index */
git_vector_foreach(&paths, i, path) { git_vector_foreach(&paths, i, path) {
if ((e = git_index_get_bypath(index_new, path, 0)) != NULL) if ((e = git_index_get_bypath(index_new, path, 0)) == NULL) {
error = git_index_add(index_repo, e); if ((error = git_index_remove(index_repo, path, 0)) < 0 &&
else error != GIT_ENOTFOUND)
error = git_index_remove(index_repo, path, 0); goto done;
}
}
/* Add updated items to the index */
git_vector_foreach(&paths, i, path) {
if ((e = git_index_get_bypath(index_new, path, 0)) != NULL) {
if ((error = git_index_add(index_repo, e)) < 0)
goto done;
}
} }
/* Add conflicts */ /* Add conflicts */