Skip to content

Fix marking traversable commits at second parent after first parent #78

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
kuychaco merged 1 commit into from
Jul 27, 2016
Merged

Fix marking traversable commits at second parent after first parent #78

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
15 changes: 5 additions & 10 deletions js/historyview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,18 +859,13 @@ define(['d3'], function() {
parent = this.getCommit(commit.parent);
parent2 = this.getCommit(commit.parent2);

commit.branchless = false;

while (parent) {
parent.branchless = false;
parent = this.getCommit(parent.parent);
function walkCommit (commit) {
commit.branchless = false
commit.parent && walkCommit.call(this, this.getCommit(commit.parent))
commit.parent2 && walkCommit.call(this, this.getCommit(commit.parent2))
}

// just in case this is a merge commit
while (parent2) {
parent2.branchless = false;
parent2 = this.getCommit(parent2.parent);
}
walkCommit.call(this, commit)
}
}

Expand Down