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.
Elijah Newren (3):
merge-ort: remove translator lego in new "submodule conflict
suggestion"
merge-ort: add comment to 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-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1325/newren/submodule-merge-messages-fixups-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1325
Range-diff vs v1:
1: 46c9b48871b ! 1: 374278c6a1d merge-ort: remove translator lego in new "submodule conflict suggestion"
@@ merge-ort.c: static int record_conflicted_index_entries(struct merge_options *op
- }
- 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) {
2: 269714da706 = 2: 340c0f46f74 merge-ort: add comment to avoid surprise with new sub_flag variable
3: 010cf4ff344 = 3: 80207d18334 merge-ort: provide helpful submodule update message when possible
--
gitgitgadget
