Re: [PATCH v3 2/2] BUG(): remove leading underscore of the format string
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 30, 2025, 13:15 UTC
- Message-ID
- <xmqqbjragryw.fsf@gitster.g>
- In-Reply-To
- <e1f84c111f6b4b5d34201ee8858a8007ea898222.1748569955.git.gitgitgadget@gmail.com>
"Lidong Yan via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 5 quoted lines
> From: Lidong Yan <502024330056@smail.nju.edu.cn>
>
> BUG() is not end-user facing but programmer facing, and we do not
> use _("...") in them. I searched all `BUG(_` pattern and replace
> them with `BUG(`The first sentence is good. We'd write the second sentence more like
Replace all occurrences of BUG(_("..."), ...) with
BUG("...", ...).I.e. you instruct somebody sitting in front of the keyboard who is modifying the code for you what to do in imperative mood.
The changes themselves look good to me.
Thanks.
Show 45 quoted lines
> Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn>
> ---
> builtin/mktag.c | 2 +-
> builtin/worktree.c | 2 +-
> pack-bitmap-write.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/mktag.c b/builtin/mktag.c
> index 7ac11c46d53f..1b1dc0263e18 100644
> --- a/builtin/mktag.c
> +++ b/builtin/mktag.c
> @@ -41,7 +41,7 @@ static int mktag_fsck_error_func(struct fsck_options *o UNUSED,
> fprintf_ln(stderr, _("error: tag input does not pass fsck: %s"), message);
> return 1;
> default:
> - BUG(_("%d (FSCK_IGNORE?) should never trigger this callback"),
> + BUG("%d (FSCK_IGNORE?) should never trigger this callback",
> msg_type);
> }
> }
> diff --git a/builtin/worktree.c b/builtin/worktree.c
> index 88a36ea9f867..2dceeeed8bd0 100644
> --- a/builtin/worktree.c
> +++ b/builtin/worktree.c
> @@ -621,7 +621,7 @@ static void print_preparing_worktree_line(int detach,
> else {
> struct commit *commit = lookup_commit_reference_by_name(branch);
> if (!commit)
> - BUG(_("unreachable: invalid reference: %s"), branch);
> + BUG("unreachable: invalid reference: %s", branch);
> fprintf_ln(stderr, _("Preparing worktree (detached HEAD %s)"),
> repo_find_unique_abbrev(the_repository, &commit->object.oid, DEFAULT_ABBREV));
> }
> diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
> index 7f400ee01213..56960e6ad760 100644
> --- a/pack-bitmap-write.c
> +++ b/pack-bitmap-write.c
> @@ -1087,7 +1087,7 @@ void bitmap_writer_finish(struct bitmap_writer *writer,
> oid_access);
>
> if (commit_pos < 0)
> - BUG(_("trying to write commit not in index"));
> + BUG("trying to write commit not in index");
> stored->commit_pos = commit_pos + base_objects;
> }