diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-12-05 00:24:50 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-05 17:06:18 +0300 |
| commit | 0c47e061768d6c3b575ff623d11d9ecb7162a90f (patch) | |
| tree | 1620ad964144785f1612bfbf2aae38b2840c794b /t/t3400-rebase.sh | |
| parent | 228f53135a4a41a37b6be8e4d6e2b6153db4a8ed (diff) | |
t3400: demonstrate failure with format.useAutoBase
Ever since bb52995f3e (format-patch: introduce format.useAutoBase
configuration, 2016-04-26), `git rebase` has been broken when
`format.useAutoBase = true`. It fails when rebasing a branch:
fatal: failed to get upstream, if you want to record base commit automatically,
please use git branch --set-upstream-to to track a remote branch.
Or you could specify base commit by --base=<base-commit-id> manually
error:
git encountered an error while preparing the patches to replay
these revisions:
ede2467cdedc63784887b587a61c36b7850ebfac..d8f581194799ae29bf5fa72a98cbae98a1198b12
As a result, git cannot rebase them.
Demonstrate that failure here.
Reported-by: Christian Biesinger <cbiesinger@google.com>
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3400-rebase.sh')
| -rwxr-xr-x | t/t3400-rebase.sh | 6 |
1 files changed, 6 insertions, 0 deletions
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 && |