[PATCH 1/3] rebase: add test for rebase --fork-point with short upstream
From: Alex Torok <hidden>
Date: 2019-12-05 22:55:09
Subsystem:
the rest · Maintainer:
Linus Torvalds
This proves the bug of "rebase --fork-point upstream branch" not using the fork point of upstream and branch if upstream is not the full refname of the upstream branch. Signed-off-by: Alex Torok <redacted> --- t/t3431-rebase-fork-point.sh | 1 + 1 file changed, 1 insertion(+)
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
index 78851b9a2a..6ecdae918e 100755
--- a/t/t3431-rebase-fork-point.sh
+++ b/t/t3431-rebase-fork-point.sh@@ -49,6 +49,7 @@ 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 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 C E D B A' refs/heads/master test_rebase 'G F C D B A' --onto D refs/heads/master
--
2.17.1