diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2022-06-18 00:20:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 16:10:06 -0700 |
| commit | 6debb7527b0e2f791256a216394503899b0488ee (patch) | |
| tree | 58ca4899487c0813d830e6e236d956792c38d75d /merge-ort.h | |
| parent | b520bc6caa35e621396dd69ae4d84314615cf7ac (diff) | |
| download | git-6debb7527b0e2f791256a216394503899b0488ee.tar.gz | |
merge-ort: store messages in a list, not in a single strbuf
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>
Diffstat (limited to 'merge-ort.h')
| -rw-r--r-- | merge-ort.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ort.h b/merge-ort.h index ddcc39d727..f9c536ed8c 100644 --- a/merge-ort.h +++ b/merge-ort.h @@ -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. */ |