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
