diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2019-12-04 13:25:11 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-12-05 06:06:18 -0800 |
| commit | cae0bc09abcb12aff79f1aea85d578df7856de4a (patch) | |
| tree | 023283ac049a5b6282f4ecbb432ec4b6d660d968 /repo-settings.c | |
| parent | format-patch: teach --no-base (diff) | |
| download | tgif-cae0bc09abcb12aff79f1aea85d578df7856de4a.tar.xz | |
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 'repo-settings.c')
0 files changed, 0 insertions, 0 deletions