proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-21 15:07:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge-base: Style

Browse Source
This commit is contained in:
Vicent Marti 2015-10-30 14:02:01 +01:00
parent 4cacf5b594
commit 1d0bed9de1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/merge.c
View File

@ -418,7 +418,9 @@ static int remove_redundant(git_revwalk *walk, git_vector *commits)
int error = 0; int error = 0;
redundant = git__calloc(commits->length, 1); redundant = git__calloc(commits->length, 1);
GITERR_CHECK_ALLOC(redundant);
filled_index = git__calloc((commits->length - 1), sizeof(unsigned int)); filled_index = git__calloc((commits->length - 1), sizeof(unsigned int));
GITERR_CHECK_ALLOC(filled_index);
for (i = 0; i < commits->length; ++i) { for (i = 0; i < commits->length; ++i) {
if ((error = git_commit_list_parse(walk, commits->contents[i])) < 0) if ((error = git_commit_list_parse(walk, commits->contents[i])) < 0)
@ -511,7 +513,10 @@ int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_l
return -1; return -1;
} }
/* more than one merge base -- remove redundants */ /*
* more than one merge base -- see if there are redundant merge
* bases and remove them
*/
if (result && result->next) { if (result && result->next) {
git_vector redundant = GIT_VECTOR_INIT; git_vector redundant = GIT_VECTOR_INIT;