On 8/13/2020 9:07 PM, Junio C Hamano wrote:
> There are still a handful mentions of SHA-1 when we meant the
> (hexadecimal) object names in end-user facing messages. Rewrite
> them.
>
> I was hoping that this can mostly be s/SHA-1/object name/, but
> a few messages needed rephrasing to keep the result readable.
>
> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
> ---
> builtin/blame.c | 2 +-
> builtin/name-rev.c | 2 +-
> builtin/pack-objects.c | 2 +-
> parse-options.h | 2 +-
> t/t0040-parse-options.sh | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/builtin/blame.c b/builtin/blame.c
> index 94ef57c1cc..76ffdf11c6 100644
> --- a/builtin/blame.c
> +++ b/builtin/blame.c
> @@ -842,7 +842,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
> const char *contents_from = NULL;
> const struct option options[] = {
> N_("Show blank SHA-1 for boundary commits (Default: off)")),
> N_("Blank object names of boundary commits (Default: off)")),
Is there a reason you dropped "show" here? Perhaps your
intention is to use "blank" as a verb, but it read a bit
awkwardly to me.
> N_("print only names (no SHA-1)")),
> N_("print only ref-based names (no object names)")),
> die("not an SHA-1 '%s'", line + 10);
> die("not an object name '%s'", line + 10);
> N_("use <n> digits to display SHA-1s"), \
> N_("use <n> digits to display object names"), \
> use <n> digits to display SHA-1s
> use <n> digits to display object names
These all seem obviously correct.
Thanks,
-Stolee
