From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 1/1] rebase: deprecate --preserve-merges
Date: Thu, 9 May 2019 16:36:13 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1905091630030.44@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <87imusj4cv.fsf@evledraar.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2194 bytes --]
Hi Ævar,
On Thu, 2 May 2019, Ævar Arnfjörð Bjarmason wrote:
> On Mon, Mar 11 2019, Johannes Schindelin via GitGitGadget wrote:
>
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > @@ -1212,6 +1212,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> > usage_with_options(builtin_rebase_usage,
> > builtin_rebase_options);
> >
> > + if (options.type == REBASE_PRESERVE_MERGES)
> > + warning(_("git rebase --preserve-merges is deprecated. "
> > + "Use --rebase-merges instead."));
> > +
> > if (action != NO_ACTION && !in_progress)
> > die(_("No rebase in progress?"));
> > setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0);
>
> An internal user reported the following "bug" they ran into:
>
> 1. They ran "git pull --rebase=preserve"
> 2. warning: git rebase --preserve-merges is deprecated. Use --rebase-merges instead.
>
> This is very confusing, since the user issued "--rebase=preserve", *not*
> "--preserve-merges".
>
> We could detect that we came from "git pull" and pass down the argv we
> used blah blah, but how about just describing things a bit more in the
> warning, e.g.:
>
> warning: the "preserve" backend for 'git rebase' has been
> deprecated. You invoked git with "rebase --preserve-merges", either
> directly, or via "pull --rebase=preserve".
>
> Use the new "rebase merges" backend of "git rebase" instead, invoked
> via "rebase --rebase-merges" or "pull --rebase=merges". Note that
> the new backend may yield different results, see the "git rebase"
> documentation for details.
Don't forget `pull.rebase`.
And the proposed text makes it sound as if the results of
`--rebase=merges` is wrong, while I would contend that it is actually more
correct than `--rebase=preserve`'s output.
In general, I do agree with the direction of making the description more
general rather than trying to teach `git-rebase--preserve-merges.sh` from
where it was called and showing a different deprecation message.
Do you want to take the lead on this? If so, be my guest, I still have to
prepare Git for Windows for -rc0...
Ciao,
Dscho
prev parent reply other threads:[~2019-05-09 14:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-07 10:00 [PATCH 0/1] Deprecate git rebase --preserve-merges Johannes Schindelin via GitGitGadget
2019-03-07 10:00 ` [PATCH 1/1] rebase: deprecate --preserve-merges Johannes Schindelin via GitGitGadget
2019-03-07 16:25 ` Phillip Wood
2019-03-11 19:31 ` Johannes Schindelin
2019-03-07 16:47 ` Eric Sunshine
2019-03-11 19:33 ` Johannes Schindelin
2019-03-11 19:57 ` [PATCH v2 0/1] Deprecate git rebase --preserve-merges Johannes Schindelin via GitGitGadget
2019-03-11 19:57 ` [PATCH v2 1/1] rebase: deprecate --preserve-merges Johannes Schindelin via GitGitGadget
2019-05-02 14:52 ` Ævar Arnfjörð Bjarmason
2019-05-09 14:36 ` Johannes Schindelin [this message]
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=nycvar.QRO.7.76.6.1905091630030.44@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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).