undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-ort-wrappers: make printed message match the one from recursive

Browse Source 
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>
This commit is contained in:
Elijah Newren 2022-07-23 01:53:11 +00:00 committed by Junio C Hamano
parent e72d93e88c
commit 11f4290001
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
merge-ort-wrappers.c
View File

@ -10,8 +10,8 @@ static int unclean(struct merge_options *opt, struct tree *head)
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
if (head && repo_index_has_changes(opt->repo, head, &sb)) { if (head && repo_index_has_changes(opt->repo, head, &sb)) {
fprintf(stderr, _("Your local changes to the following files would be overwritten by merge:\n %s"), error(_("Your local changes to the following files would be overwritten by merge:\n %s"),
sb.buf); sb.buf);
strbuf_release(&sb); strbuf_release(&sb);
return -1; return -1;
} }