From: Junio C Hamano <gitster@pobox.com>
To: Teng Long <dyroneteng@gmail.com>
Cc: git@vger.kernel.org, tenglong.tl@alibaba-inc.com
Subject: Re: [PATCH v1 1/1] surround %s with quotes when failed to lookup commit
Date: Sat, 03 Jun 2023 09:00:55 +0900 [thread overview]
Message-ID: <xmqqsfb98le0.fsf@gitster.g> (raw)
In-Reply-To: <1f7c62a8870433792076fae30d6c4dc4b61a00d8.1685366301.git.dyroneteng@gmail.com> (Teng Long's message of "Mon, 29 May 2023 21:27:56 +0800")
Teng Long <dyroneteng@gmail.com> writes:
> From: Teng Long <dyroneteng@gmail.com>
>
> The output maybe become confused to recognize if the user
Probably "may become confusing to".
> accidentally mistook an extra opening space, like:
>
> $git commit --fixup=" 6d6360b67e99c2fd82d64619c971fdede98ee74b"
> fatal: could not lookup commit 6d6360b67e99c2fd82d64619c971fdede98ee74b
I'd prefer a space between the prompt "$" and the command "git".
>
> and it will be better if we surround the %s specifier with single quotes.
Indeed. Everything else in the message I am responding to, I am
100% happy with.
Will queue with manual fixups.
Thanks.
> Signed-off-by: Teng Long <dyroneteng@gmail.com>
> ---
> builtin/commit.c | 6 +++---
> builtin/merge-tree.c | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/commit.c b/builtin/commit.c
> index e67c4be2..9ab57ea1 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -763,7 +763,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
> struct commit *c;
> c = lookup_commit_reference_by_name(squash_message);
> if (!c)
> - die(_("could not lookup commit %s"), squash_message);
> + die(_("could not lookup commit '%s'"), squash_message);
> ctx.output_encoding = get_commit_output_encoding();
> repo_format_commit_message(the_repository, c,
> "squash! %s\n\n", &sb,
> @@ -798,7 +798,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
> char *fmt;
> commit = lookup_commit_reference_by_name(fixup_commit);
> if (!commit)
> - die(_("could not lookup commit %s"), fixup_commit);
> + die(_("could not lookup commit '%s'"), fixup_commit);
> ctx.output_encoding = get_commit_output_encoding();
> fmt = xstrfmt("%s! %%s\n\n", fixup_prefix);
> repo_format_commit_message(the_repository, commit, fmt, &sb,
> @@ -1189,7 +1189,7 @@ static const char *read_commit_message(const char *name)
>
> commit = lookup_commit_reference_by_name(name);
> if (!commit)
> - die(_("could not lookup commit %s"), name);
> + die(_("could not lookup commit '%s'"), name);
> out_enc = get_commit_output_encoding();
> return repo_logmsg_reencode(the_repository, commit, NULL, out_enc);
> }
> diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
> index b8f8a8b5..4325897a 100644
> --- a/builtin/merge-tree.c
> +++ b/builtin/merge-tree.c
> @@ -448,7 +448,7 @@ static int real_merge(struct merge_tree_options *o,
>
> base_commit = lookup_commit_reference_by_name(merge_base);
> if (!base_commit)
> - die(_("could not lookup commit %s"), merge_base);
> + die(_("could not lookup commit '%s'"), merge_base);
>
> opt.ancestor = merge_base;
> base_tree = repo_get_commit_tree(the_repository, base_commit);
next prev parent reply other threads:[~2023-06-03 0:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-29 13:27 [PATCH v1 0/1] surround %s with quotes when failed to lookup commit Teng Long
2023-05-29 13:27 ` [PATCH v1 1/1] " Teng Long
2023-06-03 0:00 ` Junio C Hamano [this message]
2023-06-03 0:11 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsfb98le0.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=dyroneteng@gmail.com \
--cc=git@vger.kernel.org \
--cc=tenglong.tl@alibaba-inc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).