From: Alban Gruin <alban.gruin@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Elijah Newren <newren@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: en/rebase-backend, was Re: What's cooking in git.git (Feb 2020, #04; Mon, 17)
Date: Wed, 26 Feb 2020 11:34:49 +0100 [thread overview]
Message-ID: <3b63cd85-93b4-b6c1-6b42-c079691267dd@gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2002181659540.46@tvgsbejvaqbjf.bet>
Hi,
Le 18/02/2020 à 17:00, Johannes Schindelin a écrit :
> Hi Elijah,
>
> On Mon, 17 Feb 2020, Elijah Newren wrote:
>
>> On Mon, Feb 17, 2020 at 2:09 PM Junio C Hamano <gitster@pobox.com> wrote:
>>
>>> * en/rebase-backend (2020-02-16) 20 commits
>>> - rebase: rename the two primary rebase backends
>>> - rebase: change the default backend from "am" to "merge"
>>> - rebase: make the backend configurable via config setting
>>> - rebase tests: repeat some tests using the merge backend instead of am
>>> - rebase tests: mark tests specific to the am-backend with --am
>>> - rebase: drop '-i' from the reflog for interactive-based rebases
>>> - git-prompt: change the prompt for interactive-based rebases
>>> - rebase: add an --am option
>>> - rebase: move incompatibility checks between backend options a bit earlier
>>> - git-rebase.txt: add more details about behavioral differences of backends
>>> - rebase: allow more types of rebases to fast-forward
>>> - t3432: make these tests work with either am or merge backends
>>> - rebase: fix handling of restrict_revision
>>> - rebase: make sure to pass along the quiet flag to the sequencer
>>> - rebase, sequencer: remove the broken GIT_QUIET handling
>>> - t3406: simplify an already simple test
>>> - rebase (interactive-backend): fix handling of commits that become empty
>>> - rebase (interactive-backend): make --keep-empty the default
>>> - t3404: directly test the behavior of interest
>>> - git-rebase.txt: update description of --allow-empty-message
>>>
>>> "git rebase" has learned to use the sequencer backend by default,
>>> while allowing "--am" option to go back to the traditional "am"
>>> backend.
>>>
>>> The last step may be rushing things a bit and may want to be
>>> taken separately.
>>> cf. <pull.679.v5.git.git.1581802602.gitgitgadget@gmail.com>
>>
>> Thanks. I'm curious, though, what you mean by this last bit -- was it
>> just a reflection of my request for folks to comment on whether the
>> last patch was wanted?
>>
>> In my view, taking the last patch separately does not make sense; it
>> should either be dropped entirely or taken close to the same time as
>> the series. My reasoning for this is as follows: The only place the
>> current backend names exist is in the documentation. The cost of
>> changing the names is thus low. Once this series lands, the backend
>> names will be exposed in the user interface. If we cut a release with
>> those names, then changing the names will require a bunch of
>> transition work. So, if we're going to change the backend names, it'd
>> be better to do it sooner (while the cost is negligible) rather than
>> later.
>>
>> So far, Phillip has voiced an opinion on this (cf.
>> <e2863381-174c-a55c-bb22-0c7aec9cabf4@gmail.com>) -- "I think it is a
>> good idea - merge and apply make much more sense that interactive and
>> am"; haven't heard from anyone else yet.
>
> FWIW I am also in favor of renaming the backends. Unfortunately, I won't
> have time to review this patch series for the foreseeable time.
>
I do agree too, for the same reasons as Elijah expressed.
Alban
> Ciao,
> Dscho
>
next prev parent reply other threads:[~2020-02-26 10:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 22:08 What's cooking in git.git (Feb 2020, #04; Mon, 17) Junio C Hamano
2020-02-18 3:30 ` Elijah Newren
2020-02-18 16:00 ` en/rebase-backend, was " Johannes Schindelin
2020-02-26 10:34 ` Alban Gruin [this message]
2020-02-22 3:11 ` Elijah Newren
2020-02-22 17:18 ` Junio C Hamano
2020-02-19 19:58 ` Taylor Blau
2020-02-19 20:50 ` Eric Sunshine
2020-02-19 21:51 ` Junio C Hamano
2020-02-19 22:07 ` Taylor Blau
2020-02-21 16:26 ` Phillip Wood
2020-02-22 3:03 ` Elijah Newren
2020-02-22 17:16 ` Junio C Hamano
2020-02-26 20:04 ` Elijah Newren
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=3b63cd85-93b4-b6c1-6b42-c079691267dd@gmail.com \
--to=alban.gruin@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@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).