summaryrefslogtreecommitdiff
path: root/t/t5100/info0015
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2020-12-03 15:59:46 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-13 14:38:47 -0800
commitc5a6f65527aa3b6f5d7cf25437a88d8727ab0646 (patch)
treeb4b1e8e6cbf44b0376ed129b26a87049dbc09f8e /t/t5100/info0015
parentmerge-ort: add die-not-implemented stub handle_content_merge() function (diff)
downloadtgif-c5a6f65527aa3b6f5d7cf25437a88d8727ab0646.tar.xz
merge-ort: add modify/delete handling and delayed output processing
The focus here is on adding a path_msg() which will queue up warning/conflict/notice messages about the merge for later processing, storing these in a pathname -> strbuf map. It might seem like a big change, but it really just is: * declaration of necessary map with some comments * initialization and recording of data * a bunch of code to iterate over the map at print/free time * at least one caller in order to avoid an error about having an unused function (which we provide in the form of implementing modify/delete conflict handling). At this stage, it is probably not clear why I am opting for delayed output processing. There are multiple reasons: 1. Merges are supposed to abort if they would overwrite dirty changes in the working tree. We cannot correctly determine whether changes would be overwritten until both rename detection has occurred and full processing of entries with the renames has finalized. Warning/conflict/notice messages come up at intermediate codepaths along the way, so unless we want spurious conflict/warning messages being printed when the merge will be aborted anyway, we need to save these messages and only print them when relevant. 2. There can be multiple messages for a single path, and we want all messages for a give path to appear together instead of having them grouped by conflict/warning type. This was a problem already with merge-recursive.c but became even more important due to the splitting apart of conflict types as discussed in the commit message for 1f3c9ba707 ("t6425: be more flexible with rename/delete conflict messages", 2020-08-10) 3. Some callers might want to avoid showing the output in certain cases, such as if the end result is a clean merge. Rebases have typically done this. 4. Some callers might not want the output to go to stdout or even stderr, but might want to do something else with it entirely. For example, a --remerge-diff option to `git show` or `git log -p` that remerges on the fly and diffs merge commits against the remerged version would benefit from stdout/stderr not being written to in the standard form. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100/info0015')
0 files changed, 0 insertions, 0 deletions