Skip to content
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.

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

Count merge commits in path filtered height if any parent changed it #659

Merged
merged 2 commits into from Sep 23, 2021

Conversation

AArnott
Copy link
Collaborator

@AArnott AArnott commented Sep 22, 2021

The managed git implementation had it correctly implemented, according to the code comments in the libgit2 implementation. But those code comments did not match the code in the libgit2 implementation. As a result, the managed git code did not match.

In this commit I correct the libgit2 impl code comments to describe what the code actually does. Then I fix the identical code comment and code in the managed git implementation to match.

Fixes #658

The managed git implementation had it correctly implemented, according to the code comments in the libgit2 implementation. But those code comments did not match the *code* in the libgit2 implementation. As a result, the managed git code did not match.
In this commit I correct the libgit2 impl code comments to describe what the code *actually* does. Then I fix the identical code comment and code in the managed git implementation to match.

Fixes #658
@AArnott AArnott added this to the v3.4 milestone Sep 22, 2021
@AArnott AArnott self-assigned this Sep 22, 2021
@AArnott
Copy link
Collaborator Author

AArnott commented Sep 22, 2021

@qmfrederik Can you review this too, please?

@AArnott AArnott merged commit 5496648 into v3.4 Sep 23, 2021
@AArnott AArnott deleted the fix658 branch September 23, 2021 03:39
Copy link
Contributor

@qmfrederik qmfrederik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit late, but LGTM, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants