diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-12-05 00:25:11 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-05 17:06:18 +0300 |
| commit | cae0bc09abcb12aff79f1aea85d578df7856de4a (patch) | |
| tree | 023283ac049a5b6282f4ecbb432ec4b6d660d968 /t/t3400-rebase.sh | |
| parent | 945dc55dda595a3e5449017797cb90599ed9ecb5 (diff) | |
rebase: fix format.useAutoBase breakage
With `format.useAutoBase = true`, running rebase resulted in an
error:
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.
Fix this by always passing `--no-base` to format-patch from rebase so
that the effect of `format.useAutoBase` is negated.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index ca99e8c6c4..1323f30fee 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -159,7 +159,7 @@ 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_expect_success 'rebase works with format.useAutoBase' ' test_config format.useAutoBase true && git checkout topic && git rebase master |