rebase: fix format.useAutoBase breakage
authorDenton Liu <liu.denton@gmail.com>
Wed, 4 Dec 2019 21:25:11 +0000 (13:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 14:06:18 +0000 (06:06 -0800)
commitcae0bc09abcb12aff79f1aea85d578df7856de4a
tree023283ac049a5b6282f4ecbb432ec4b6d660d968
parent945dc55dda595a3e5449017797cb90599ed9ecb5
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>
builtin/rebase.c
t/t3400-rebase.sh