@matheusbsbs / matheus-bagliano / commits / 24c5a270d1

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>

Jeff King committed Sep 16, 2023 at 18:11 UTC 24c5a270d10a7857cc3f0e6f3b04933f69ee2c8c
3 files changed +5 -5
merge-ort.c
+2 -2
@@ -2105,12 +2105,12 @@ static int handle_content_merge(struct merge_options *opt,
2105 &result_buf);
2106
2107 if ((merge_status < 0) || !result_buf.ptr)
2108 - ret = error(_("Failed to execute internal merge"));
2108 + ret = error(_("failed to execute internal merge"));
2109
2110 if (!ret &&
2111 write_object_file(result_buf.ptr, result_buf.size,
2112 OBJ_BLOB, &result->oid))
2113 - ret = error(_("Unable to add %s to database"), path);
2113 + ret = error(_("unable to add %s to database"), path);
2114
2115 free(result_buf.ptr);
2116 if (ret)
merge-recursive.c
+2 -2
@@ -1383,12 +1383,12 @@ static int merge_mode_and_contents(struct merge_options *opt,
1383 extra_marker_size);
1384
1385 if ((merge_status < 0) || !result_buf.ptr)
1386 - ret = err(opt, _("Failed to execute internal merge"));
1386 + ret = err(opt, _("failed to execute internal merge"));
1387
1388 if (!ret &&
1389 write_object_file(result_buf.ptr, result_buf.size,
1390 OBJ_BLOB, &result->blob.oid))
1391 - ret = err(opt, _("Unable to add %s to database"),
1391 + ret = err(opt, _("unable to add %s to database"),
1392 a->path);
1393
1394 free(result_buf.ptr);
t/t6406-merge-attr.sh
+1 -1
@@ -180,7 +180,7 @@ test_expect_success !WINDOWS 'custom merge driver that is killed with a signal'
180 >./please-abort &&
181 echo "* merge=custom" >.gitattributes &&
182 test_must_fail git merge main 2>err &&
183 - grep "^error: Failed to execute internal merge" err &&
183 + grep "^error: failed to execute internal merge" err &&
184 git ls-files -u >output &&
185 git diff --name-only HEAD >>output &&
186 test_must_be_empty output