[PATCH 1/5] t3400: demonstrate failure with format.useAutoBase
- From
Denton Liu <liu.denton@gmail.com>
- Date
- Nov 27, 2019, 02:09 UTC
- Message-ID
- <a1741e54346a387a65e272f0210118ce81475358.1574820308.git.liu.denton@gmail.com>
- In-Reply-To
- <cover.1574820308.git.liu.denton@gmail.com>
Ever since bb52995f3e (format-patch: introduce format.useAutoBase configuration, 2016-04-26), `git rebase` has been broken when `format.useAutoBase = true`. Demonstrate that failure here.
Reported-by: Christian Biesinger <cbiesinger@google.com> Signed-off-by: Denton Liu <liu.denton@gmail.com> --- t/t3400-rebase.sh | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index ab18ac5f28..ca99e8c6c4 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -159,6 +159,12 @@ test_expect_success 'fail when upstream arg is missing and not configured' ' test_must_fail git rebase ' +test_expect_failure 'rebase works with format.useAutoBase' ' + test_config format.useAutoBase true && + git checkout topic && + git rebase master +' + test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' ' git checkout -b default-base master && git checkout -b default topic &&
-- 2.24.0.504.g3cd56eb17d