global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge-ort: store messages in a list, not in a single strbuf

Browse Source 
To prepare for using the `merge-ort` machinery in server operations, we
cannot simply produce a free-form string that combines a variable-length
list of messages.

Instead, we need to list them one by one. The natural fit for this is a
`string_list`.

We will subsequently add even more information in the `util` attribute
of the string list items.

Based-on-a-patch-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
2022-06-18 00:20:54 +00:00
committed by Junio C Hamano
parent b520bc6caa
commit 6debb7527b
2 changed files with 81 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-ort.h
View File

@@ -28,7 +28,7 @@ struct merge_result {
/*
* Special messages and conflict notices for various paths
*
* This is a map of pathnames to strbufs. It contains various
* This is a map of pathnames to strbufs. It contains various
* warning/conflict/notice messages (possibly multiple per path)
* that callers may want to use.
*/