summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-12-09 10:51:47 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-11 09:59:39 -0800
commitf08132f889c00a8108f61541e047649ad0e660e4 (patch)
treef5e3a0f2b336c05ffbedc12238968ebdf2ca70e4 /GIT-VERSION-GEN
parentGit 2.24 (diff)
downloadtgif-f08132f889c00a8108f61541e047649ad0e660e4.tar.xz
rebase: --fork-point regression fix
"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: Alex Torok <alext9@gmail.com> [jc: revamped the fix and used Alex's tests] Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions