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

subtree: fix argument handling in check_parents #1086

Closed
wants to merge 1 commit into from

Commits on Dec 8, 2021

  1. subtree: fix argument handling in check_parents

    315a84f (subtree: use commits before rejoins for splits, 2018-09-28)
    changed the signature of check_parents from 'check_parents [REV...]'
    to 'check_parents PARENTS_EXPR INDENT'. In other words the variable list
    of parent revisions became a list embedded in a string. However it
    neglected to unpack the list again before sending it to cache_miss,
    leading to incorrect calls whenever more than one parent was present.
    This is the case whenever a merge commit is processed, with the end
    result being a loss of performance from unecessary rechecks.
    
    The indent parameter was subsequently removed in e9525a8 (subtree:
    have $indent actually affect indentation, 2021-04-27), but the argument
    handling bug remained.
    
    For consistency, take multiple arguments in check_parents,
    and pass all of them to cache_miss separately.
    
    Signed-off-by: James Limbouris <james@digitalmatter.com>
    jamesl-dm committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    cdc5295 View commit details
    Browse the repository at this point in the history