diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 00:20:56 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 16:10:06 -0700 |
| commit | cb2607759e27627aca614726dc50e98ac0ba6d19 (patch) | |
| tree | 6c9d1cffbbc98eed4ad4396b59d2b26bcce56843 /commit-graph.c | |
| parent | merge-ort: make `path_messages` a strmap to a string_list (diff) | |
| download | git-cb2607759e27627aca614726dc50e98ac0ba6d19.tar.gz git-cb2607759e27627aca614726dc50e98ac0ba6d19.zip | |
merge-ort: store more specific conflict information
It is all fine and dandy for a regular Git command that is intended to
be run interactively to produce a bunch of messages upon an error.
However, in `merge-ort`'s case, we want to call the command e.g. in
server-side software, where the actual error messages are not quite as
interesting as machine-readable, immutable terms that describe the exact
nature of any given conflict.
With this patch, the `merge-ort` machinery records the exact type (as
specified via an `enum` value) as well as the involved path(s) together
with the conflict's message.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions