Skip to content
  • Junio C Hamano's avatar
    rebase: --fork-point regression fix · f08132f8
    Junio C Hamano authored
    
    
    "git rebase --fork-point master" used to work OK, as it internally
    called "git merge-base --fork-point" that knew how to handle short
    refname and dwim it to the full refname before calling the
    underlying get_fork_point() function.
    
    This is no longer true after the command was rewritten in C, as its
    internall call made directly to get_fork_point() does not dwim a
    short ref.
    
    Move the "dwim the refname argument to the full refname" logic that
    is used in "git merge-base" to the underlying get_fork_point()
    function, so that the other caller of the function in the
    implementation of "git rebase" behaves the same way to fix this
    regression.
    
    Signed-off-by: default avatarAlex Torok <alext9@gmail.com>
    [jc: revamped the fix and used Alex's tests]
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    f08132f8