From: Christian Biesinger <cbiesinger@google.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 0/5] rebase: fix breakage with `format.useAutoBase`
Date: Wed, 27 Nov 2019 11:14:59 -0600 [thread overview]
Message-ID: <CAPTJ0XH62P_-R4XCy5Jv-egQ06H8eJZ4YhLdRGAt721WVD5bXQ@mail.gmail.com> (raw)
In-Reply-To: <cover.1574820308.git.liu.denton@gmail.com>
On Tue, Nov 26, 2019 at 8:09 PM Denton Liu <liu.denton@gmail.com> wrote:
>
> Thanks for reporting the breakage, Christian.
>
> Apparently, this use case has been broken for a long time... Since
> bb52995f3e (format-patch: introduce format.useAutoBase configuration,
> 2016-04-26). I'm surprised it's only been reported now.
Thanks for fixing! Maybe few people use this option as it's not
documented in the format-patch manpage? (A separate thing to fix, I
guess)
Christian
> This patchset fixes the breakage by teaching
> `git format-patch --no-base` and making rebase use it.
>
> Denton Liu (5):
> t3400: demonstrate failure with format.useAutoBase
> format-patch: fix indentation
> t4014: use `test_config`
> format-patch: teach --no-base
> rebase: fix `format.useAutoBase` breakage
>
> Documentation/git-format-patch.txt | 5 +++--
> builtin/log.c | 26 ++++++++++++++++++++++----
> builtin/rebase.c | 3 ++-
> t/t3400-rebase.sh | 6 ++++++
> t/t4014-format-patch.sh | 14 +++++++++-----
> 5 files changed, 42 insertions(+), 12 deletions(-)
>
> --
> 2.24.0.504.g3cd56eb17d
>
next prev parent reply other threads:[~2019-11-27 17:15 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 ` Christian Biesinger [this message]
2019-11-27 18:13 ` [PATCH v2 0/5] rebase: fix breakage with `format.useAutoBase` Denton Liu
2019-11-27 18:13 ` [PATCH v2 1/5] t3400: demonstrate failure with format.useAutoBase Denton Liu
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=CAPTJ0XH62P_-R4XCy5Jv-egQ06H8eJZ4YhLdRGAt721WVD5bXQ@mail.gmail.com \
--to=cbiesinger@google.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).