kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge-ort: lowercase a few error messages 

As noted in CodingGuidelines, error messages should not be capitalized.
Fix up a few of these that were copied verbatim from merge-recursive to
match our modern style.

We'll likewise fix up the matching ones from merge-recursive. We care a
bit less there, since the hope is that it will eventually go away. But
besides being the right thing to do in the meantime, it is necessary for
t6406 to pass both with and without GIT_TEST_MERGE_ALGORITHM set (one of
our CI jobs sets it to "recursive", which will use the merge-recursive.c
code). An alternative would be to use "grep -i" in the test to check
the message, but it's nice for the test suite to be be more exact (we'd
notice if the capitalization fix regressed).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2023-09-16 18:11:46 -04:00 committed by Junio C Hamano
parent 6eb0c0eb7a
commit 24c5a270d1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
merge-ort.c
View File

@ -2105,12 +2105,12 @@ static int handle_content_merge(struct merge_options *opt,
&result_buf);

if ((merge_status < 0) || !result_buf.ptr)
ret = error(_("Failed to execute internal merge"));
ret = error(_("failed to execute internal merge"));

if (!ret &&
write_object_file(result_buf.ptr, result_buf.size,
OBJ_BLOB, &result->oid))
ret = error(_("Unable to add %s to database"), path);
ret = error(_("unable to add %s to database"), path);

free(result_buf.ptr);
if (ret)

4
merge-recursive.c
View File

@ -1383,12 +1383,12 @@ static int merge_mode_and_contents(struct merge_options *opt,
extra_marker_size);

if ((merge_status < 0) || !result_buf.ptr)
ret = err(opt, _("Failed to execute internal merge"));
ret = err(opt, _("failed to execute internal merge"));

if (!ret &&
write_object_file(result_buf.ptr, result_buf.size,
OBJ_BLOB, &result->blob.oid))
ret = err(opt, _("Unable to add %s to database"),
ret = err(opt, _("unable to add %s to database"),
a->path);

free(result_buf.ptr);

2
t/t6406-merge-attr.sh
View File

@ -180,7 +180,7 @@ test_expect_success !WINDOWS 'custom merge driver that is killed with a signal'
>./please-abort &&
echo "* merge=custom" >.gitattributes &&
test_must_fail git merge main 2>err &&
grep "^error: Failed to execute internal merge" err &&
grep "^error: failed to execute internal merge" err &&
git ls-files -u >output &&
git diff --name-only HEAD >>output &&
test_must_be_empty output