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.

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

Jump to bottom

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

Merged
merged 2 commits into from Sep 23, 2021
Merged

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

merged 2 commits into from Sep 23, 2021

Commits on Sep 21, 2021

  1. Add test for version height with path filters and merge conflict 

    This demonstrates the repro for #658
    @AArnott
    AArnott committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    3866cd6 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2021

  1. Count merge commits in path filtered height if any parent changed it 

    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 committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    96be5aa View commit details
    Browse the repository at this point in the history