From: Philippe Blain <levraiphilippeblain@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, phillip.wood123@gmail.com
Cc: Philippe Blain via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Elijah Newren <newren@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
ZheNing Hu <adlternative@gmail.com>
Subject: Re: [PATCH v2 2/2] builtin/am: allow disabling conflict advice
Date: Sat, 16 Mar 2024 16:01:05 -0400 [thread overview]
Message-ID: <c9b3714b-e009-5c86-3cfa-993be018dd01@gmail.com> (raw)
In-Reply-To: <xmqq5xxsu1z5.fsf@gitster.g>
Le 2024-03-11 à 13:12, Junio C Hamano a écrit :
> phillip.wood123@gmail.com writes:
>
>> Hi Philippe
>>
>> On 10/03/2024 19:51, Philippe Blain via GitGitGadget wrote:
>>> diff --git a/builtin/am.c b/builtin/am.c
>>> index d1990d7edcb..0e97b827e4b 100644
>>> --- a/builtin/am.c
>>> +++ b/builtin/am.c
>>> @@ -1150,19 +1150,23 @@ static const char *msgnum(const struct am_state *state)
>>> static void NORETURN die_user_resolve(const struct am_state *state)
>>> {
>>> if (state->resolvemsg) {
>>> - printf_ln("%s", state->resolvemsg);
>>> + advise_if_enabled(ADVICE_MERGE_CONFLICT, "%s", state->resolvemsg);
>>> } else {
>>> const char *cmdline = state->interactive ? "git am -i" : "git am";
>>> + struct strbuf sb = STRBUF_INIT;
>>> - printf_ln(_("When you have resolved this problem, run
>>> \"%s --continue\"."), cmdline);
>>> - printf_ln(_("If you prefer to skip this patch, run \"%s --skip\" instead."), cmdline);
>>> + strbuf_addf(&sb, _("When you have resolved this problem, run \"%s --continue\"."), cmdline);
>>> + strbuf_addf(&sb, _("If you prefer to skip this patch, run \"%s --skip\" instead."), cmdline);
>>
>> I think you need to append "\n" to the message strings here (and
>> below) to match the behavior of printf_ln().
>
> Good eyes. You'll get the final "\n" but the line breaks inside the
> paragraph you give to advise*() functions are your responsibility.
> Even though advice.c:vadvise() handles multi-line message better
> (unlike usage.c:vreportf() that is used for error() and die()) by
> giving a line header for each line of the message, we do not wrap
> lines at runtime.
>
>> Apart from that both patches look good to me, thanks for
>> re-rolling. It is a bit surprising that we don't need to update any
>
> Thanks, both, and indeed it is a bit surprising.
>
>> rebase tests. I haven't checked but I guess either we're not testing
>> this advice when rebasing or we're using a grep expression that is
>> vague enough not to be affected.
We are not testing this advice when rebasing _with the apply backend_.
We are testing it with the merge backend (in t5520-pull.sh) but we are
only grepping stderr for "Resolve all conflicts manually" so I did not
have to change anything. I'll add that to the commit message for completeness.
We were testing the apply backend through the same test before 2ac0d6273f
(rebase: change the default backend from "am" to "merge", 2020-02-15).
Thanks,
Philippe.
next prev parent reply other threads:[~2024-03-16 20:01 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-02 16:18 [PATCH] sequencer: allow disabling conflict advice Philippe Blain via GitGitGadget
2024-03-02 16:32 ` Philippe Blain
2024-03-03 22:57 ` Junio C Hamano
2024-03-09 17:22 ` Philippe Blain
2024-03-09 18:58 ` Philippe Blain
2024-03-09 19:55 ` Junio C Hamano
2024-03-09 23:19 ` Junio C Hamano
2024-03-04 10:12 ` Phillip Wood
2024-03-04 10:27 ` Phillip Wood
2024-03-04 17:56 ` Junio C Hamano
2024-03-09 17:53 ` Philippe Blain
2024-03-09 19:15 ` Phillip Wood
2024-03-09 19:56 ` Junio C Hamano
2024-03-09 18:01 ` Philippe Blain
2024-03-10 19:50 ` [PATCH v2 0/2] Allow disabling advice shown after merge conflicts Philippe Blain via GitGitGadget
2024-03-10 19:51 ` [PATCH v2 1/2] sequencer: allow disabling conflict advice Philippe Blain via GitGitGadget
2024-03-11 10:29 ` Kristoffer Haugsbakk
2024-03-16 19:33 ` Philippe Blain
2024-03-10 19:51 ` [PATCH v2 2/2] builtin/am: " Philippe Blain via GitGitGadget
2024-03-11 10:54 ` phillip.wood123
2024-03-11 17:12 ` Junio C Hamano
2024-03-11 17:49 ` Junio C Hamano
2024-03-16 19:44 ` Philippe Blain
2024-03-16 20:01 ` Philippe Blain [this message]
2024-03-11 20:58 ` [PATCH v2 0/2] Allow disabling advice shown after merge conflicts Rubén Justo
2024-03-16 20:33 ` Philippe Blain
2024-03-16 21:16 ` [PATCH v3 " Philippe Blain via GitGitGadget
2024-03-16 21:16 ` [PATCH v3 1/2] sequencer: allow disabling conflict advice Philippe Blain via GitGitGadget
2024-03-16 21:16 ` [PATCH v3 2/2] builtin/am: " Philippe Blain via GitGitGadget
2024-03-18 16:31 ` [PATCH v3 0/2] Allow disabling advice shown after merge conflicts Junio C Hamano
2024-03-25 10:48 ` Phillip Wood
2024-03-25 16:57 ` Junio C Hamano
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=c9b3714b-e009-5c86-3cfa-993be018dd01@gmail.com \
--to=levraiphilippeblain@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=adlternative@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).