diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2022-10-17 16:17:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-17 21:53:03 +0300 |
| commit | aa1df8146d70bb85c63b0999868fe29aebc1173e (patch) | |
| tree | 8a3f340c4ab0cdcdd8e76decc533645717beb1ca /t/t3431-rebase-fork-point.sh | |
| parent | ce5238a690821d1de230091dd6c9c13a99ed6752 (diff) | |
rebase --keep-base: imply --no-fork-point
Given the name of the option it is confusing if --keep-base actually
changes the base of the branch without --fork-point being explicitly
given on the command line.
The combination of --keep-base with an explicit --fork-point is still
supported even though --fork-point means we do not keep the same base
if the upstream branch has been rewound. We do this in case anyone is
relying on this behavior which is tested in t3431[1]
[1] https://lore.kernel.org/git/20200715032014.GA10818@generichostname/
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3431-rebase-fork-point.sh')
| -rwxr-xr-x | t/t3431-rebase-fork-point.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh index 1d0b15380e..70e8136356 100755 --- a/t/t3431-rebase-fork-point.sh +++ b/t/t3431-rebase-fork-point.sh @@ -50,7 +50,7 @@ test_rebase () { 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 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 |