On Thu, Sep 14, 2023 at 05:34:09AM -0400, Jeff King wrote:
> A few small cleanups for merge-ort collected from playing with
> -Wunused-parameter. The first one actually fixes a user-visible bug, and
> the rest are just cleanups.
>
> [1/4]: merge-ort: drop custom err() function
> [2/4]: merge-ort: stop passing "opt" to read_oid_strbuf()
> [3/4]: merge-ort: drop unused parameters from detect_and_process_renames()
> [4/4]: merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()
Here's one more clean-up on top. I hesitated on this for the initial
send just because I didn't know if we might want to switch these error
messages to path_msg(), which does capitalize sometimes. But Elijah's
response convinced me that we should just leave them in place, in which
case it makes sense to do a minimal style fixup.
Junio, this is on top of what you've queued in
jk/ort-unused-parameter-cleanups.
-- >8 --
Subject: [PATCH] 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.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
merge-ort.c | 4 ++--
t/t6406-merge-attr.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/merge-ort.c b/merge-ort.c
index 3953c9f745..7857ce9fbd 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -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)
diff --git a/t/t6406-merge-attr.sh b/t/t6406-merge-attr.sh
index 05ad13b23e..72f8c1722f 100755
--- a/t/t6406-merge-attr.sh
+++ b/t/t6406-merge-attr.sh
@@ -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
--
2.42.0.661.g2507eb519e
