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>

Denton Liu committed Dec 4, 2019 at 13:25 UTC cae0bc09abcb12aff79f1aea85d578df7856de4a

2 files changed +3 -2

builtin/rebase.c

+2 -1

@@ -1012,7 +1012,8 @@ static int run_am(struct rebase_options *opts)

1012 argv_array_pushl(&format_patch.args, "format-patch", "-k", "--stdout",

1013 "--full-index", "--cherry-pick", "--right-only",

1014 "--src-prefix=a/", "--dst-prefix=b/", "--no-renames",

1015 - "--no-cover-letter", "--pretty=mboxrd", "--topo-order", NULL);

1015 + "--no-cover-letter", "--pretty=mboxrd", "--topo-order",

1016 + "--no-base", NULL);

1017 if (opts->git_format_patch_opt.len)

1018 argv_array_split(&format_patch.args,

1019 opts->git_format_patch_opt.buf);

t/t3400-rebase.sh

+1 -1

@@ -159,7 +159,7 @@ test_expect_success 'fail when upstream arg is missing and not configured' '

159 test_must_fail git rebase

160 '

161

162 -test_expect_failure 'rebase works with format.useAutoBase' '

162 +test_expect_success 'rebase works with format.useAutoBase' '

163 test_config format.useAutoBase true &&

164 git checkout topic &&

165 git rebase master