[v4,1/5] t3400: demonstrate failure with format.useAutoBase
diff mbox series

Message ID 386148a550bdbd06e3c35cd506f69c229a4df664.1575494618.git.liu.denton@gmail.com
State New
Headers show
  • rebase: fix breakage with `format.useAutoBase`
Related show

Commit Message

Denton Liu Dec. 4, 2019, 9:24 p.m. UTC
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
	git encountered an error while preparing the patches to replay
	these revisions:


	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>
 t/t3400-rebase.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff mbox series

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 &&