From: Junio C Hamano <gitster@pobox•com>
To: Calvin Wan <calvinwan@google•com>
Cc: git@vger•kernel.org, newren@gmail•com,
Johannes.Schindelin@gmx•de, avarab@gmail•com
Subject: Re: [PATCH v8] submodule merge: update conflict error message
Date: Tue, 16 Aug 2022 08:58:34 -0700 [thread overview]
Message-ID: <xmqqczd0xjrp.fsf@gitster.g> (raw)
In-Reply-To: <20220804195105.1303455-1-calvinwan@google.com> (Calvin Wan's message of "Thu, 4 Aug 2022 19:51:05 +0000")
Calvin Wan <calvinwan@google•com> writes:
> @@ -4412,6 +4459,99 @@ static int record_conflicted_index_entries(struct merge_options *opt)
> return errs;
> }
>
> +static void format_submodule_conflict_suggestion(struct strbuf *msg) {
> + struct strbuf tmp = STRBUF_INIT;
> + struct string_list msg_list = STRING_LIST_INIT_DUP;
> + int i;
> +
> + string_list_split(&msg_list, msg->buf, '\n', -1);
> + for (i = 0; i < msg_list.nr; i++) {
> + if (!i)
> + /*
> + * TRANSLATORS: This is line item of submodule conflict message
> + * from print_submodule_conflict_suggestion() below. For RTL
> + * languages, the following swap is suggested:
> + * " - %s\n" -> "%s - \n"
> + */
> + strbuf_addf(&tmp, _(" - %s\n"), msg_list.items[i].string);
> + else
> + /*
> + * TRANSLATORS: This is line item of submodule conflict message
> + * from print_submodule_conflict_suggestion() below. For RTL
> + * languages, the following swap is suggested:
> + * " %s\n" -> "%s \n"
> + */
> + strbuf_addf(&tmp, _(" %s\n"), msg_list.items[i].string);
> + }
> + strbuf_reset(msg);
> + strbuf_add(msg, tmp.buf, tmp.len);
> +}
Here, tmp is not released, and mst_list holds the words split out of msg.
merge-ort.c | 2 ++
1 file changed, 2 insertions(+)
diff --git i/merge-ort.c w/merge-ort.c
index 4cb92bdff8..cdb53770be 100644
--- i/merge-ort.c
+++ w/merge-ort.c
@@ -4507,6 +4507,8 @@ static void format_submodule_conflict_suggestion(struct strbuf *msg) {
}
strbuf_reset(msg);
strbuf_add(msg, tmp.buf, tmp.len);
+ string_list_clear(&msg_list, 0);
+ strbuf_release(&tmp);
}
static void print_submodule_conflict_suggestion(struct string_list *csub) {
next prev parent reply other threads:[~2022-08-16 16:00 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-06 23:54 [PATCH] submodule merge: update conflict error message Calvin Wan
2022-06-07 0:48 ` Junio C Hamano
2022-06-08 17:19 ` Calvin Wan
2022-06-08 17:34 ` Glen Choo
2022-06-08 18:01 ` Calvin Wan
2022-06-08 19:13 ` Junio C Hamano
2022-06-10 23:11 ` [PATCH v2] " Calvin Wan
2022-06-11 4:53 ` Elijah Newren
2022-06-11 17:08 ` Philippe Blain
2022-06-12 6:56 ` Elijah Newren
2022-06-13 2:03 ` Calvin Wan
2022-06-12 23:30 ` Junio C Hamano
2022-06-13 1:54 ` Calvin Wan
2022-06-29 22:40 ` [PATCH v3] " Calvin Wan
2022-06-30 2:40 ` Elijah Newren
2022-06-30 19:48 ` Calvin Wan
2022-07-01 4:27 ` Elijah Newren
2022-06-30 20:35 ` Glen Choo
2022-06-30 20:45 ` Glen Choo
2022-06-30 21:08 ` Calvin Wan
2022-07-12 23:19 ` [PATCH v4] " Calvin Wan
2022-07-13 18:11 ` Junio C Hamano
2022-07-17 2:46 ` Elijah Newren
2022-07-15 12:57 ` Johannes Schindelin
2022-07-16 6:22 ` Junio C Hamano
2022-07-17 2:44 ` Elijah Newren
2022-07-18 17:03 ` Calvin Wan
2022-07-18 21:43 ` [PATCH v5] " Calvin Wan
2022-07-19 6:39 ` Junio C Hamano
2022-07-19 19:30 ` Calvin Wan
2022-07-19 20:16 ` Junio C Hamano
2022-07-19 7:13 ` Junio C Hamano
2022-07-19 19:07 ` Calvin Wan
2022-07-19 20:30 ` Junio C Hamano
2022-07-25 6:05 ` Ævar Arnfjörð Bjarmason
2022-07-25 12:11 ` Ævar Arnfjörð Bjarmason
2022-07-25 22:03 ` Calvin Wan
2022-07-25 12:31 ` Ævar Arnfjörð Bjarmason
2022-07-25 21:27 ` Calvin Wan
2022-07-26 21:00 ` [PATCH v6] " Calvin Wan
2022-07-27 1:13 ` Elijah Newren
2022-07-27 22:00 ` Calvin Wan
2022-07-28 0:41 ` Elijah Newren
2022-07-28 19:06 ` Calvin Wan
2022-07-27 9:20 ` Ævar Arnfjörð Bjarmason
2022-07-28 21:12 ` [PATCH v7] " Calvin Wan
2022-07-28 23:22 ` Ævar Arnfjörð Bjarmason
2022-07-29 0:24 ` Elijah Newren
2022-08-01 22:24 ` Calvin Wan
2022-08-01 12:06 ` Ævar Arnfjörð Bjarmason
2022-08-02 0:50 ` Junio C Hamano
2022-08-02 21:03 ` Calvin Wan
2022-08-02 21:11 ` Junio C Hamano
2022-08-02 21:55 ` Calvin Wan
2022-08-02 22:22 ` Junio C Hamano
2022-08-04 19:51 ` [PATCH v8] " Calvin Wan
2022-08-16 15:58 ` Junio C Hamano [this message]
2022-08-16 18:58 ` Junio C Hamano
2022-08-16 19:34 ` Calvin Wan
2022-08-16 19:39 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqczd0xjrp.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=avarab@gmail$(echo .)com \
--cc=calvinwan@google$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=newren@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox