From: Denton Liu <liu.denton@gmail.com> To: Git Mailing List <git@vger.kernel.org> Cc: Christian Biesinger <cbiesinger@google.com>, Eric Sunshine <sunshine@sunshineco.com> Subject: [PATCH v2 1/5] t3400: demonstrate failure with format.useAutoBase Date: Wed, 27 Nov 2019 10:13:39 -0800 Message-ID: <4089e51041a9cbd15e62882c370ed254d8e63cfd.1574878089.git.liu.denton@gmail.com> (raw) In-Reply-To: <cover.1574878089.git.liu.denton@gmail.com> 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 that doesn't have an upstream set: 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. 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 --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 && -- 2.24.0.504.g3cd56eb17d
next prev parent reply other threads:[~2019-11-27 18:13 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-26 20:50 Bug with "git rebase" when format.useAutoBase is set Christian Biesinger 2019-11-27 2:09 ` [PATCH 0/5] rebase: fix breakage with `format.useAutoBase` Denton Liu 2019-11-27 2:09 ` [PATCH 1/5] t3400: demonstrate failure with format.useAutoBase Denton Liu 2019-11-27 2:26 ` Eric Sunshine 2019-11-30 17:25 ` Junio C Hamano 2019-11-27 2:09 ` [PATCH 2/5] format-patch: fix indentation Denton Liu 2019-11-27 2:09 ` [PATCH 3/5] t4014: use `test_config` Denton Liu 2019-11-27 2:09 ` [PATCH 4/5] format-patch: teach --no-base Denton Liu 2019-11-27 2:09 ` [PATCH 5/5] rebase: fix `format.useAutoBase` breakage Denton Liu 2019-11-27 2:42 ` Eric Sunshine 2019-11-27 17:14 ` [PATCH 0/5] rebase: fix breakage with `format.useAutoBase` Christian Biesinger 2019-11-27 18:13 ` [PATCH v2 " Denton Liu 2019-11-27 18:13 ` Denton Liu [this message] 2019-11-27 18:13 ` [PATCH v2 2/5] format-patch: fix indentation Denton Liu 2019-11-27 18:13 ` [PATCH v2 3/5] t4014: use test_config() Denton Liu 2019-11-27 18:13 ` [PATCH v2 4/5] format-patch: teach --no-base Denton Liu 2019-11-27 19:56 ` Denton Liu 2019-11-27 18:13 ` [PATCH v2 5/5] rebase: fix format.useAutoBase breakage Denton Liu 2019-12-04 16:21 ` Christian Biesinger 2019-12-04 7:47 ` [PATCH v3 0/5] rebase: fix breakage with `format.useAutoBase` Denton Liu 2019-12-04 7:47 ` [PATCH v3 1/5] t3400: demonstrate failure with format.useAutoBase Denton Liu 2019-12-04 7:47 ` [PATCH v3 2/5] format-patch: fix indentation Denton Liu 2019-12-04 7:47 ` [PATCH v3 3/5] t4014: use test_config() Denton Liu 2019-12-04 7:47 ` [PATCH v3 4/5] format-patch: teach --no-base Denton Liu 2019-12-04 10:36 ` René Scharfe 2019-12-04 17:26 ` Junio C Hamano 2019-12-04 7:48 ` [PATCH v3 5/5] rebase: fix format.useAutoBase breakage Denton Liu 2019-12-04 21:24 ` [PATCH v4 0/5] rebase: fix breakage with `format.useAutoBase` Denton Liu 2019-12-04 21:24 ` [PATCH v4 1/5] t3400: demonstrate failure with format.useAutoBase Denton Liu 2019-12-04 21:24 ` [PATCH v4 2/5] format-patch: fix indentation Denton Liu 2019-12-04 21:25 ` [PATCH v4 3/5] t4014: use test_config() Denton Liu 2019-12-04 21:25 ` [PATCH v4 4/5] format-patch: teach --no-base Denton Liu 2019-12-04 21:25 ` [PATCH v4 5/5] rebase: fix format.useAutoBase breakage Denton Liu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4089e51041a9cbd15e62882c370ed254d8e63cfd.1574878089.git.liu.denton@gmail.com \ --to=liu.denton@gmail.com \ --cc=cbiesinger@google.com \ --cc=git@vger.kernel.org \ --cc=sunshine@sunshineco.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git