Thanks to visit codestin.com
Credit goes to github.com

Skip to content

blame_git: fix coalescing step never being executed #4580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2018
Merged

blame_git: fix coalescing step never being executed #4580

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/blame_git.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,8 @@ static void coalesce(git_blame *blame)

int git_blame__like_git(git_blame *blame, uint32_t opt)
{
int error = 0;

while (true) {
git_blame__entry *ent;
git_blame__origin *suspect = NULL;
Expand All @@ -632,13 +634,13 @@ int git_blame__like_git(git_blame *blame, uint32_t opt)
if (!ent->guilty)
suspect = ent->suspect;
if (!suspect)
return 0; /* all done */
break;

/* We'll use this suspect later in the loop, so hold on to it for now. */
origin_incref(suspect);

if (pass_blame(blame, suspect, opt) < 0)
return -1;
if ((error = pass_blame(blame, suspect, opt)) < 0)
break;

/* Take responsibility for the remaining entries */
for (ent = blame->ent; ent; ent = ent->next) {
Expand All @@ -652,9 +654,10 @@ int git_blame__like_git(git_blame *blame, uint32_t opt)
origin_decref(suspect);
}

coalesce(blame);
if (!error)
coalesce(blame);

return 0;
return error;
}

void git_blame__free_entry(git_blame__entry *ent)
Expand Down