mirror of
https://github.com/git/git.git
synced 2024-05-26 00:06:16 +02:00
f08132f889
"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>
78 lines
1.8 KiB
Bash
Executable File
78 lines
1.8 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2019 Denton Liu
|
|
#
|
|
|
|
test_description='git rebase --fork-point test'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# A---B---D---E (master)
|
|
# \
|
|
# C*---F---G (side)
|
|
#
|
|
# C was formerly part of master but master was rewound to remove C
|
|
#
|
|
test_expect_success setup '
|
|
test_commit A &&
|
|
test_commit B &&
|
|
test_commit C &&
|
|
git branch -t side &&
|
|
git reset --hard HEAD^ &&
|
|
test_commit D &&
|
|
test_commit E &&
|
|
git checkout side &&
|
|
test_commit F &&
|
|
test_commit G
|
|
'
|
|
|
|
test_rebase () {
|
|
expected="$1" &&
|
|
shift &&
|
|
test_expect_success "git rebase $*" "
|
|
git checkout master &&
|
|
git reset --hard E &&
|
|
git checkout side &&
|
|
git reset --hard G &&
|
|
git rebase $* &&
|
|
test_write_lines $expected >expect &&
|
|
git log --pretty=%s >actual &&
|
|
test_cmp expect actual
|
|
"
|
|
}
|
|
|
|
test_rebase 'G F E D B A'
|
|
test_rebase 'G F D B A' --onto D
|
|
test_rebase 'G F B A' --keep-base
|
|
test_rebase 'G F C E D B A' --no-fork-point
|
|
test_rebase 'G F C D B A' --no-fork-point --onto D
|
|
test_rebase 'G F C B A' --no-fork-point --keep-base
|
|
|
|
test_rebase 'G F E D B A' --fork-point refs/heads/master
|
|
test_rebase 'G F E D B A' --fork-point master
|
|
|
|
test_rebase 'G F D B A' --fork-point --onto D refs/heads/master
|
|
test_rebase 'G F D B A' --fork-point --onto D master
|
|
|
|
test_rebase 'G F B A' --fork-point --keep-base refs/heads/master
|
|
test_rebase 'G F B A' --fork-point --keep-base master
|
|
|
|
test_rebase 'G F C E D B A' refs/heads/master
|
|
test_rebase 'G F C E D B A' master
|
|
|
|
test_rebase 'G F C D B A' --onto D refs/heads/master
|
|
test_rebase 'G F C D B A' --onto D master
|
|
|
|
test_rebase 'G F C B A' --keep-base refs/heads/master
|
|
test_rebase 'G F C B A' --keep-base master
|
|
|
|
test_expect_success 'git rebase --fork-point with ambigous refname' '
|
|
git checkout master &&
|
|
git checkout -b one &&
|
|
git checkout side &&
|
|
git tag one &&
|
|
test_must_fail git rebase --fork-point --onto D one
|
|
'
|
|
|
|
test_done
|