Skip to content
Snippets Groups Projects
  • Mads Kiilerich's avatar
    c51d6c043bb1
    rebase: clarify comment about merge ancestor when rebasing merges · c51d6c043bb1
    Mads Kiilerich authored
    The code for picking a merge ancestor when rebasing merges had a long and
    incorrect comment.
    
    The comment would perhaps have been fine as commit message but does
    not make the code more readable or maintainable and is a bad
    substitute for correct and readable code.
    
    The correct essense of the comment is quite trivial: a merge of an ancestor of
    the rebase destination and an 'outside' revision can be rebased as if it was a
    linear change, using 'destination ancestor parent' as base and pretty much
    ignoring the 'outside' revision.
    
    The code path where the comment is placed is however also used for other kinds
    of merge rebases. The comment is thus not really correct and not helpful. I
    think it would be better to drop the comment and rewrite the code.
    c51d6c043bb1
    History
    rebase: clarify comment about merge ancestor when rebasing merges
    Mads Kiilerich authored
    The code for picking a merge ancestor when rebasing merges had a long and
    incorrect comment.
    
    The comment would perhaps have been fine as commit message but does
    not make the code more readable or maintainable and is a bad
    substitute for correct and readable code.
    
    The correct essense of the comment is quite trivial: a merge of an ancestor of
    the rebase destination and an 'outside' revision can be rebased as if it was a
    linear change, using 'destination ancestor parent' as base and pretty much
    ignoring the 'outside' revision.
    
    The code path where the comment is placed is however also used for other kinds
    of merge rebases. The comment is thus not really correct and not helpful. I
    think it would be better to drop the comment and rewrite the code.