From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Calvin Wan <calvinwan@google.com>,
Elijah Newren <newren@gmail.com>,
Elijah Newren <newren@gmail.com>
Subject: [PATCH v3 0/3] Fixups for cw/submodule-merge-messages
Date: Thu, 18 Aug 2022 07:15:24 +0000 [thread overview]
Message-ID: <pull.1325.v3.git.1660806927.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1325.v2.git.1660718028.gitgitgadget@gmail.com>
This series fixes a few issues I noted in cw/submodule-merge-messages (which
merged to next a few days ago). Sorry for not responding before that topic
merged to next; I caught Covid near the end of my vacation and it took me
out for a while. So here are a few patches on top instead.
Changes since v1:
* rebased directly on top of Calvin's patch, allowing Junio's patch in
cw/submodule-merge-messages to be dropped.
Changes since v2:
* changed the second patch to instead initialize sub_flag to
CONFLICT_SUBMODULE_FAILED_TO_MERGE, as suggested by Junio. (thanks!)
Elijah Newren (3):
merge-ort: remove translator lego in new "submodule conflict
suggestion"
merge-ort: avoid surprise with new sub_flag variable
merge-ort: provide helpful submodule update message when possible
merge-ort.c | 104 +++++++++++++++++-----------------------------------
1 file changed, 34 insertions(+), 70 deletions(-)
base-commit: 4057523a4061092e9181220d54dca9eadcb75bdc
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1325%2Fnewren%2Fsubmodule-merge-messages-fixups-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1325/newren/submodule-merge-messages-fixups-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/1325
Range-diff vs v2:
1: 374278c6a1d = 1: 374278c6a1d merge-ort: remove translator lego in new "submodule conflict suggestion"
2: 340c0f46f74 < -: ----------- merge-ort: add comment to avoid surprise with new sub_flag variable
-: ----------- > 2: 48200773a1b merge-ort: avoid surprise with new sub_flag variable
3: 80207d18334 = 3: 4c4a8f028d4 merge-ort: provide helpful submodule update message when possible
--
gitgitgadget
next prev parent reply other threads:[~2022-08-18 7:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 0:27 [PATCH 0/3] Fixups for cw/submodule-merge-messages Elijah Newren via GitGitGadget
2022-08-17 0:27 ` [PATCH 1/3] merge-ort: remove translator lego in new "submodule conflict suggestion" Elijah Newren via GitGitGadget
2022-08-17 0:28 ` [PATCH 2/3] merge-ort: add comment to avoid surprise with new sub_flag variable Elijah Newren via GitGitGadget
2022-08-17 0:28 ` [PATCH 3/3] merge-ort: provide helpful submodule update message when possible Elijah Newren via GitGitGadget
2022-08-17 5:37 ` [PATCH 0/3] Fixups for cw/submodule-merge-messages Junio C Hamano
2022-08-17 6:33 ` [PATCH v2 " Elijah Newren via GitGitGadget
2022-08-17 6:33 ` [PATCH v2 1/3] merge-ort: remove translator lego in new "submodule conflict suggestion" Elijah Newren via GitGitGadget
2022-08-17 6:33 ` [PATCH v2 2/3] merge-ort: add comment to avoid surprise with new sub_flag variable Elijah Newren via GitGitGadget
2022-08-17 21:45 ` Junio C Hamano
2022-08-18 6:36 ` Elijah Newren
2022-08-17 6:33 ` [PATCH v2 3/3] merge-ort: provide helpful submodule update message when possible Elijah Newren via GitGitGadget
2022-08-17 21:31 ` [PATCH v2 0/3] Fixups for cw/submodule-merge-messages Junio C Hamano
2022-08-18 7:15 ` Elijah Newren via GitGitGadget [this message]
2022-08-18 7:15 ` [PATCH v3 1/3] merge-ort: remove translator lego in new "submodule conflict suggestion" Elijah Newren via GitGitGadget
2022-08-18 7:15 ` [PATCH v3 2/3] merge-ort: avoid surprise with new sub_flag variable Elijah Newren via GitGitGadget
2022-08-18 7:15 ` [PATCH v3 3/3] merge-ort: provide helpful submodule update message when possible Elijah Newren 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=pull.1325.v3.git.1660806927.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=calvinwan@google.com \
--cc=git@vger.kernel.org \
--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).