| commit | 11f4290001989fcd071e59382be0574a87be68fe | |
| author | Elijah Newren <newren@gmail.com> | |
| Sat, 23 Jul 2022 01:53:11 +0000 (23 01:53 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 23 Jul 2022 04:45:22 +0000 (22 21:45 -0700) | ||
| tree | 48acd22a72ef8c8d42af2657b3b9435c09753fed | treesnapshot (tar.gz zip) |
| parent | e72d93e88cb20b06e88e6e7d81bd1dc4effe453f | commitdiff |
merge-ort-wrappers: make printed message match the one from recursive
When the index does not match HEAD, the merge strategies are responsible
to detect that condition and abort. The merge-ort-wrappers had code to
implement this and meant to copy the error message from merge-recursive
but deviated in two ways, both due to the message in merge-recursive
being processed by another function that made additional changes:
* It added an implicit "error: " prefix
* It added an implicit trailing newline
We can get these things by making use of the error() function.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When the index does not match HEAD, the merge strategies are responsible
to detect that condition and abort. The merge-ort-wrappers had code to
implement this and meant to copy the error message from merge-recursive
but deviated in two ways, both due to the message in merge-recursive
being processed by another function that made additional changes:
* It added an implicit "error: " prefix
* It added an implicit trailing newline
We can get these things by making use of the error() function.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ort-wrappers.c | diffblobblamehistory |