From: Junio C Hamano <gitster@pobox.com>
To: Philip Oakley <philipoakley@iee.email>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Philip Oakley via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH 2/3] rebase: help users when dying with `preserve-merges`
Date: Thu, 26 May 2022 13:42:19 -0700 [thread overview]
Message-ID: <xmqq1qwgxbys.fsf@gitster.g> (raw)
In-Reply-To: <00229772-f075-0b0c-7810-7debf6b971bc@iee.email> (Philip Oakley's message of "Thu, 26 May 2022 12:44:49 +0100")
Philip Oakley <philipoakley@iee.email> writes:
>>> Make the `rebase --abort` option available to allow users to remove
>>> traces of any preserve-merges rebase, even if they had upgraded
>>> during a rebase.
This patch does not make it "available", though.
Suggest using `--abort` to get out of the situation after a
failed preserve-rebase and remove traces of ...
perhaps?
I do think the suggestion is worth doing if a user ever gets into
the situation, but how likely does it happen? A user has to start
"rebase -p" with older Git, wait until Git gets updated to a future
version of Git that includes this change, and then say "rebase -p
--continue"?
>>> } else if (is_directory(merge_dir())) {
>>> strbuf_reset(&buf);
>>> strbuf_addf(&buf, "%s/rewritten", merge_dir());
>>> - if (is_directory(buf.buf)) {
>>> - die("`rebase -p` is no longer supported");
>>> + if (is_directory(buf.buf) && !(action == ACTION_ABORT)) {
>>> + die("`rebase --preserve-merges` (-p) is no longer supported.\n"
>>> + "Use `git rebase --abort` to terminate current rebase.\n"
>>> + "Or downgrade to v2.33, or earlier, to complete the rebase.\n");
>>> } else {
>>> strbuf_reset(&buf);
>>> strbuf_addf(&buf, "%s/interactive", merge_dir());
>> Existing issue: No _(), shouldn't we add it?
> This `strbuf_addf` is forming a path for internal use. It just happens
> to look like legible English ;-)
I do not think Ævar meant "%s/interactive"; the enhanced message
above that you inherited from the original "no longer supported"
that was not marked for translation.
>> I wonder if we should use die_message() + advise() in these cases,
>> i.e. stick to why we died in die_message() and have the advise() make
>> suggestions, as e4921d877ab (tracking branches: add advice to ambiguous
>> refspec error, 2022-04-01) does.
>
> Ah, maybe it's my message.. that needs translating.
Yup.
This whole '-p' business will go away in a few releases down, so a
longer message give to the existing die() should be sufficient and
there is no need for the choice between "yes, I am still weaning
myself off of rebase -p and want to keep seeing the advice" and
"thanks, I saw the message often enough, you no longer need to tell
me how to get out", I would think.
Thanks.
next prev parent reply other threads:[~2022-05-26 20:42 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 9:21 [PATCH 0/3] Die preserve ggg Philip Oakley via GitGitGadget
2022-05-26 9:21 ` [PATCH 1/3] rebase.c: state preserve-merges has been removed Philip Oakley via GitGitGadget
2022-05-26 9:40 ` Ævar Arnfjörð Bjarmason
2022-05-26 11:40 ` Philip Oakley
2022-05-26 13:02 ` René Scharfe
2022-05-26 20:33 ` Junio C Hamano
2022-05-26 21:27 ` René Scharfe
2022-05-26 23:23 ` Junio C Hamano
2022-05-27 12:35 ` Philip Oakley
2022-05-27 12:17 ` Philip Oakley
2022-05-27 15:45 ` Junio C Hamano
2022-05-27 12:12 ` Philip Oakley
2022-05-27 12:34 ` Ævar Arnfjörð Bjarmason
2022-05-26 9:21 ` [PATCH 2/3] rebase: help users when dying with `preserve-merges` Philip Oakley via GitGitGadget
2022-05-26 9:43 ` Ævar Arnfjörð Bjarmason
2022-05-26 11:44 ` Philip Oakley
2022-05-26 20:42 ` Junio C Hamano [this message]
2022-05-27 12:58 ` Philip Oakley
2022-05-27 15:54 ` Junio C Hamano
2022-05-26 9:21 ` [PATCH 3/3] rebase: note `preserve` merges may be a pull config option Philip Oakley via GitGitGadget
2022-05-26 9:50 ` Ævar Arnfjörð Bjarmason
2022-05-26 12:01 ` Philip Oakley
2022-05-26 20:55 ` Junio C Hamano
2022-05-27 12:08 ` Philip Oakley
2022-05-26 9:54 ` [PATCH 0/3] Die preserve ggg Ævar Arnfjörð Bjarmason
2022-05-26 12:57 ` Philip Oakley
2022-06-04 11:17 ` [PATCH v2 0/4] " Philip Oakley via GitGitGadget
2022-06-04 11:17 ` [PATCH v2 1/4] rebase.c: state preserve-merges has been removed Philip Oakley via GitGitGadget
2022-06-04 11:17 ` [PATCH v2 2/4] rebase: help users when dying with `preserve-merges` Philip Oakley via GitGitGadget
2022-06-04 11:17 ` [PATCH v2 3/4] rebase: note `preserve` merges may be a pull config option Philip Oakley via GitGitGadget
2022-06-06 17:57 ` Junio C Hamano
2022-06-11 14:03 ` Philip Oakley
2022-06-11 15:38 ` Philip Oakley
2022-06-11 19:22 ` Junio C Hamano
2022-06-04 11:17 ` [PATCH v2 4/4] rebase: translate a die(preserve-merges) message Philip Oakley via GitGitGadget
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=xmqq1qwgxbys.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=philipoakley@iee.email \
/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).