{"thread":{"id":"54040","subject":"[PATCH] messages: avoid SHA-1 in end-user facing messages","startedAt":"2020-08-14T01:07:21Z","lastAt":"2020-08-14T16:41:07Z","messageCount":9,"participants":["Junio C Hamano","brian m. carlson","Derrick Stolee","Eric Sunshine"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"403608","messageId":"xmqqy2miyr0f.fsf@gitster.c.googlers.com","threadId":"54040","inReplyTo":null,"subject":"[PATCH] messages: avoid SHA-1 in end-user facing messages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-08-14T01:07:12Z","receivedAt":"2020-08-14T01:07:21Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"There are still a handful mentions of SHA-1 when we meant the\n(hexadecimal) object names in end-user facing messages.  Rewrite\nthem.\n\nI was hoping that this can mostly be s/SHA-1/object name/, but\na few messages needed rephrasing to keep the result readable.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n builtin/blame.c          | 2 +-\n builtin/name-rev.c       | 2 +-\n builtin/pack-objects.c   | 2 +-\n parse-options.h          | 2 +-\n t/t0040-parse-options.sh | 2 +-\n 5 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/builtin/blame.c b/builtin/blame.c\nindex 94ef57c1cc..76ffdf11c6 100644\n--- a/builtin/blame.c\n+++ b/builtin/blame.c\n@@ -842,7 +842,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)\n \tconst char *contents_from = NULL;\n \tconst struct option options[] = {\n \t\tOPT_BOOL(0, \"incremental\", &incremental, N_(\"Show blame entries as we find them, incrementally\")),\n-\t\tOPT_BOOL('b', NULL, &blank_boundary, N_(\"Show blank SHA-1 for boundary commits (Default: off)\")),\n+\t\tOPT_BOOL('b', NULL, &blank_boundary, N_(\"Blank object names of boundary commits (Default: off)\")),\n \t\tOPT_BOOL(0, \"root\", &show_root, N_(\"Do not treat root commits as boundaries (Default: off)\")),\n \t\tOPT_BOOL(0, \"show-stats\", &show_stats, N_(\"Show work cost statistics\")),\n \t\tOPT_BOOL(0, \"progress\", &show_progress, N_(\"Force progress reporting\")),\ndiff --git a/builtin/name-rev.c b/builtin/name-rev.c\nindex a9dcd25e46..725dd04519 100644\n--- a/builtin/name-rev.c\n+++ b/builtin/name-rev.c\n@@ -521,7 +521,7 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)\n \tint all = 0, transform_stdin = 0, allow_undefined = 1, always = 0, peel_tag = 0;\n \tstruct name_ref_data data = { 0, 0, STRING_LIST_INIT_NODUP, STRING_LIST_INIT_NODUP };\n \tstruct option opts[] = {\n-\t\tOPT_BOOL(0, \"name-only\", &data.name_only, N_(\"print only names (no SHA-1)\")),\n+\t\tOPT_BOOL(0, \"name-only\", &data.name_only, N_(\"print only ref-based names (no object names)\")),\n \t\tOPT_BOOL(0, \"tags\", &data.tags_only, N_(\"only use tags to name the commits\")),\n \t\tOPT_STRING_LIST(0, \"refs\", &data.ref_filters, N_(\"pattern\"),\n \t\t\t\t   N_(\"only use refs matching <pattern>\")),\ndiff --git a/builtin/pack-objects.c b/builtin/pack-objects.c\nindex a8692d27f1..5617c01b5a 100644\n--- a/builtin/pack-objects.c\n+++ b/builtin/pack-objects.c\n@@ -3357,7 +3357,7 @@ static void get_object_list(int ac, const char **av)\n \t\t\tif (starts_with(line, \"--shallow \")) {\n \t\t\t\tstruct object_id oid;\n \t\t\t\tif (get_oid_hex(line + 10, &oid))\n-\t\t\t\t\tdie(\"not an SHA-1 '%s'\", line + 10);\n+\t\t\t\t\tdie(\"not an object name '%s'\", line + 10);\n \t\t\t\tregister_shallow(the_repository, &oid);\n \t\t\t\tuse_bitmap_index = 0;\n \t\t\t\tcontinue;\ndiff --git a/parse-options.h b/parse-options.h\nindex 46af942093..7030d8f3da 100644\n--- a/parse-options.h\n+++ b/parse-options.h\n@@ -314,7 +314,7 @@ int parse_opt_passthru_argv(const struct option *, const char *, int);\n #define OPT__FORCE(var, h, f) OPT_COUNTUP_F('f', \"force\",   (var), (h), (f))\n #define OPT__ABBREV(var)  \\\n \t{ OPTION_CALLBACK, 0, \"abbrev\", (var), N_(\"n\"),\t\\\n-\t  N_(\"use <n> digits to display SHA-1s\"),\t\\\n+\t  N_(\"use <n> digits to display object names\"),\t\\\n \t  PARSE_OPT_OPTARG, &parse_opt_abbrev_cb, 0 }\n #define OPT__COLOR(var, h) \\\n \tOPT_COLOR_FLAG(0, \"color\", (var), (h))\ndiff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh\nindex f8178ee4e3..14cafc138b 100755\n--- a/t/t0040-parse-options.sh\n+++ b/t/t0040-parse-options.sh\n@@ -44,7 +44,7 @@ Magic arguments\n     --no-ambiguous        negative ambiguity\n \n Standard options\n-    --abbrev[=<n>]        use <n> digits to display SHA-1s\n+    --abbrev[=<n>]        use <n> digits to display object names\n     -v, --verbose         be verbose\n     -n, --dry-run         dry run\n     -q, --quiet           be quiet\n"},{"id":"403609","messageId":"20200814011133.GJ8085@camp.crustytoothpaste.net","threadId":"54040","inReplyTo":"xmqqy2miyr0f.fsf@gitster.c.googlers.com","subject":"Re: [PATCH] messages: avoid SHA-1 in end-user facing messages","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2020-08-14T01:11:33Z","receivedAt":"2020-08-14T01:11:41Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On 2020-08-14 at 01:07:12, Junio C Hamano wrote:\n> There are still a handful mentions of SHA-1 when we meant the\n> (hexadecimal) object names in end-user facing messages.  Rewrite\n> them.\n> \n> I was hoping that this can mostly be s/SHA-1/object name/, but\n> a few messages needed rephrasing to keep the result readable.\n\nAll of these seem reasonable, and I think \"object name\" is fine for\nthis purpose.\n-- \nbrian m. carlson: Houston, Texas, US\n"},{"id":"403614","messageId":"ee61b773-91c0-4b30-1d5b-e941bba03867@gmail.com","threadId":"54040","inReplyTo":"xmqqy2miyr0f.fsf@gitster.c.googlers.com","subject":"Re: [PATCH] messages: avoid SHA-1 in end-user facing messages","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2020-08-14T02:21:51Z","receivedAt":"2020-08-14T02:21:55Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 8/13/2020 9:07 PM, Junio C Hamano wrote:\n> There are still a handful mentions of SHA-1 when we meant the\n> (hexadecimal) object names in end-user facing messages.  Rewrite\n> them.\n> \n> I was hoping that this can mostly be s/SHA-1/object name/, but\n> a few messages needed rephrasing to keep the result readable.\n> \n> Signed-off-by: Junio C Hamano <gitster@pobox.com>\n> ---\n>  builtin/blame.c          | 2 +-\n>  builtin/name-rev.c       | 2 +-\n>  builtin/pack-objects.c   | 2 +-\n>  parse-options.h          | 2 +-\n>  t/t0040-parse-options.sh | 2 +-\n>  5 files changed, 5 insertions(+), 5 deletions(-)\n> \n> diff --git a/builtin/blame.c b/builtin/blame.c\n> index 94ef57c1cc..76ffdf11c6 100644\n> --- a/builtin/blame.c\n> +++ b/builtin/blame.c\n> @@ -842,7 +842,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)\n>  \tconst char *contents_from = NULL;\n>  \tconst struct option options[] = {\n\n\n> N_(\"Show blank SHA-1 for boundary commits (Default: off)\")),\n> N_(\"Blank object names of boundary commits (Default: off)\")),\n\nIs there a reason you dropped \"show\" here? Perhaps your\nintention is to use \"blank\" as a verb, but it read a bit\nawkwardly to me.\n\n> N_(\"print only names (no SHA-1)\")),\n> N_(\"print only ref-based names (no object names)\")),\n\n> die(\"not an SHA-1 '%s'\", line + 10);\n> die(\"not an object name '%s'\", line + 10);\n\n> N_(\"use <n> digits to display SHA-1s\"),\t\\\n> N_(\"use <n> digits to display object names\"),\t\\\n\n> use <n> digits to display SHA-1s\n> use <n> digits to display object names\n\nThese all seem obviously correct.\n\nThanks,\n-Stolee\n\n"},{"id":"403624","messageId":"xmqqlfihzvhu.fsf@gitster.c.googlers.com","threadId":"54040","inReplyTo":"ee61b773-91c0-4b30-1d5b-e941bba03867@gmail.com","subject":"Re: [PATCH] messages: avoid SHA-1 in end-user facing messages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-08-14T04:45:01Z","receivedAt":"2020-08-14T04:45:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Derrick Stolee <stolee@gmail.com> writes:\n\n>> N_(\"Show blank SHA-1 for boundary commits (Default: off)\")),\n>> N_(\"Blank object names of boundary commits (Default: off)\")),\n>\n> Is there a reason you dropped \"show\" here? Perhaps your\n> intention is to use \"blank\" as a verb, but it read a bit\n> awkwardly to me.\n\nYou guessed my intention correctly.  By using the word \"blank\" as a\nverb (i.e. to fill the space, which should ordinarily contain\nsomething meaningful, with whitespace instead), I can shorten \"Show\nblank\" to compensate the lengthening of the message caused by\nreplacing \"SHA-1\" with \"object name\".\n\nIt also is more correct.  There is no \"blank SHA-1\"; blank cannot be\na valid SHA-1 hash value.  We are showing blank instead of SHA-1,\nand I found that \"blank\" as a verb exactly has that meaning, which\nwas convenient.\n\nThe above is *NOT* to defend the choice of the exact phasing I used,\nbut to explain the criteria we need to use to come up with a better\nalternative (in other words, why \"show blank object name for...\" is\na better replacement).\n\nA better phrasing to replace it is of course welcome.\n\nThanks.\n"},{"id":"403626","messageId":"CAPig+cTTr8VdzeaPewktdncvnTWHjieEnEPV+vbD=GVbK7zQNQ@mail.gmail.com","threadId":"54040","inReplyTo":"xmqqlfihzvhu.fsf@gitster.c.googlers.com","subject":"Re: [PATCH] messages: avoid SHA-1 in end-user facing messages","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2020-08-14T04:51:08Z","receivedAt":"2020-08-14T04:51:22Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Fri, Aug 14, 2020 at 12:45 AM Junio C Hamano <gitster@pobox.com> wrote:\n> >> N_(\"Show blank SHA-1 for boundary commits (Default: off)\")),\n> >> N_(\"Blank object names of boundary commits (Default: off)\")),\n>\n> You guessed my intention correctly.  By using the word \"blank\" as a\n> verb (i.e. to fill the space, which should ordinarily contain\n> something meaningful, with whitespace instead), I can shorten \"Show\n> blank\" to compensate the lengthening of the message caused by\n> replacing \"SHA-1\" with \"object name\".\n>\n> A better phrasing to replace it is of course welcome.\n\nPerhaps?\n\n    \"suppress object names of boundary commits (default: off)\"\n"},{"id":"403634","messageId":"xmqqd03tzley.fsf@gitster.c.googlers.com","threadId":"54040","inReplyTo":"CAPig+cTTr8VdzeaPewktdncvnTWHjieEnEPV+vbD=GVbK7zQNQ@mail.gmail.com","subject":"Re: [PATCH] messages: avoid SHA-1 in end-user facing messages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-08-14T08:22:45Z","receivedAt":"2020-08-14T08:22:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Sunshine <sunshine@sunshineco.com> writes:\n\n> On Fri, Aug 14, 2020 at 12:45 AM Junio C Hamano <gitster@pobox.com> wrote:\n>> >> N_(\"Show blank SHA-1 for boundary commits (Default: off)\")),\n>> >> N_(\"Blank object names of boundary commits (Default: off)\")),\n>>\n>> You guessed my intention correctly.  By using the word \"blank\" as a\n>> verb (i.e. to fill the space, which should ordinarily contain\n>> something meaningful, with whitespace instead), I can shorten \"Show\n>> blank\" to compensate the lengthening of the message caused by\n>> replacing \"SHA-1\" with \"object name\".\n>>\n>> A better phrasing to replace it is of course welcome.\n>\n> Perhaps?\n>\n>     \"suppress object names of boundary commits (default: off)\"\n\nI think we want a verb that not just means to \"remove\" but also to\n\"replace with the same amount of whitespace so that the overall\nalignment is kept\".  To \"blank out\" would mean exactly that; I do\nnot know about \"to suppress\", though.\n\nThanks.\n"},{"id":"403644","messageId":"5e9805f4-81c0-39bc-463a-8c47872f6456@gmail.com","threadId":"54040","inReplyTo":"xmqqd03tzley.fsf@gitster.c.googlers.com","subject":"Re: [PATCH] messages: avoid SHA-1 in end-user facing messages","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2020-08-14T12:21:38Z","receivedAt":"2020-08-14T12:21:44Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 8/14/2020 4:22 AM, Junio C Hamano wrote:\n> Eric Sunshine <sunshine@sunshineco.com> writes:\n> \n>> On Fri, Aug 14, 2020 at 12:45 AM Junio C Hamano <gitster@pobox.com> wrote:\n>>>>> N_(\"Show blank SHA-1 for boundary commits (Default: off)\")),\n>>>>> N_(\"Blank object names of boundary commits (Default: off)\")),\n>>>\n>>> You guessed my intention correctly.  By using the word \"blank\" as a\n>>> verb (i.e. to fill the space, which should ordinarily contain\n>>> something meaningful, with whitespace instead), I can shorten \"Show\n>>> blank\" to compensate the lengthening of the message caused by\n>>> replacing \"SHA-1\" with \"object name\".\n\nAh, the \"whitespace, not all-zeroes\" is something that I misunderstood.\nThat makes a verb change valuable in this instance.\n\n>>> A better phrasing to replace it is of course welcome.\n>>\n>> Perhaps?\n>>\n>>     \"suppress object names of boundary commits (default: off)\"\n> \n> I think we want a verb that not just means to \"remove\" but also to\n> \"replace with the same amount of whitespace so that the overall\n> alignment is kept\".  To \"blank out\" would mean exactly that; I do\n> not know about \"to suppress\", though.\n\nWhat about something as simple as:\n\n\t\"Do not show object names of boundary commits (Default: off)\"\n\nWhile this doesn't imply that the object name positions are filled with\nwhitespace, that is just a formatting concern.\n\nThanks,\n-Stolee\n"},{"id":"403684","messageId":"xmqq8sehyysl.fsf@gitster.c.googlers.com","threadId":"54040","inReplyTo":"5e9805f4-81c0-39bc-463a-8c47872f6456@gmail.com","subject":"Re: [PATCH] messages: avoid SHA-1 in end-user facing messages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-08-14T16:31:22Z","receivedAt":"2020-08-14T16:31:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Derrick Stolee <stolee@gmail.com> writes:\n\n> What about something as simple as:\n>\n> \t\"Do not show object names of boundary commits (Default: off)\"\n>\n> While this doesn't imply that the object name positions are filled with\n> whitespace, that is just a formatting concern.\n\nNice.  I like messages that stick to simple and easy words.\n\nThanks.\n"},{"id":"403685","messageId":"xmqq4kp5yycp.fsf_-_@gitster.c.googlers.com","threadId":"54040","inReplyTo":"xmqq8sehyysl.fsf@gitster.c.googlers.com","subject":"[PATCH v2] messages: avoid SHA-1 in end-user facing messages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-08-14T16:40:54Z","receivedAt":"2020-08-14T16:41:07Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> Derrick Stolee <stolee@gmail.com> writes:\n>\n>> What about something as simple as:\n>>\n>> \t\"Do not show object names of boundary commits (Default: off)\"\n>>\n>> While this doesn't imply that the object name positions are filled with\n>> whitespace, that is just a formatting concern.\n>\n> Nice.  I like messages that stick to simple and easy words.\n>\n> Thanks.\n\nOK, so hopefully this update can be queued.\n\n1:  455aadf6a5 ! 1:  4279000d3e messages: avoid SHA-1 in end-user facing messages\n    @@ builtin/blame.c: int cmd_blame(int argc, const char **argv, const char *prefix)\n      \tconst struct option options[] = {\n      \t\tOPT_BOOL(0, \"incremental\", &incremental, N_(\"Show blame entries as we find them, incrementally\")),\n     -\t\tOPT_BOOL('b', NULL, &blank_boundary, N_(\"Show blank SHA-1 for boundary commits (Default: off)\")),\n    -+\t\tOPT_BOOL('b', NULL, &blank_boundary, N_(\"Blank object names of boundary commits (Default: off)\")),\n    ++\t\tOPT_BOOL('b', NULL, &blank_boundary, N_(\"Do not show object names of boundary commits (Default: off)\")),\n      \t\tOPT_BOOL(0, \"root\", &show_root, N_(\"Do not treat root commits as boundaries (Default: off)\")),\n      \t\tOPT_BOOL(0, \"show-stats\", &show_stats, N_(\"Show work cost statistics\")),\n      \t\tOPT_BOOL(0, \"progress\", &show_progress, N_(\"Force progress reporting\")),\n\n-- >8 --\nThere are still a handful mentions of SHA-1 when we meant the\n(hexadecimal) object names in end-user facing messages.  Rewrite\nthem.\n\nI was hoping that this can mostly be s/SHA-1/object name/, but\na few messages needed rephrasing to keep the result readable.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n builtin/blame.c          | 2 +-\n builtin/name-rev.c       | 2 +-\n builtin/pack-objects.c   | 2 +-\n parse-options.h          | 2 +-\n t/t0040-parse-options.sh | 2 +-\n 5 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/builtin/blame.c b/builtin/blame.c\nindex 94ef57c1cc..eb513fbe60 100644\n--- a/builtin/blame.c\n+++ b/builtin/blame.c\n@@ -842,7 +842,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)\n \tconst char *contents_from = NULL;\n \tconst struct option options[] = {\n \t\tOPT_BOOL(0, \"incremental\", &incremental, N_(\"Show blame entries as we find them, incrementally\")),\n-\t\tOPT_BOOL('b', NULL, &blank_boundary, N_(\"Show blank SHA-1 for boundary commits (Default: off)\")),\n+\t\tOPT_BOOL('b', NULL, &blank_boundary, N_(\"Do not show object names of boundary commits (Default: off)\")),\n \t\tOPT_BOOL(0, \"root\", &show_root, N_(\"Do not treat root commits as boundaries (Default: off)\")),\n \t\tOPT_BOOL(0, \"show-stats\", &show_stats, N_(\"Show work cost statistics\")),\n \t\tOPT_BOOL(0, \"progress\", &show_progress, N_(\"Force progress reporting\")),\ndiff --git a/builtin/name-rev.c b/builtin/name-rev.c\nindex a9dcd25e46..725dd04519 100644\n--- a/builtin/name-rev.c\n+++ b/builtin/name-rev.c\n@@ -521,7 +521,7 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)\n \tint all = 0, transform_stdin = 0, allow_undefined = 1, always = 0, peel_tag = 0;\n \tstruct name_ref_data data = { 0, 0, STRING_LIST_INIT_NODUP, STRING_LIST_INIT_NODUP };\n \tstruct option opts[] = {\n-\t\tOPT_BOOL(0, \"name-only\", &data.name_only, N_(\"print only names (no SHA-1)\")),\n+\t\tOPT_BOOL(0, \"name-only\", &data.name_only, N_(\"print only ref-based names (no object names)\")),\n \t\tOPT_BOOL(0, \"tags\", &data.tags_only, N_(\"only use tags to name the commits\")),\n \t\tOPT_STRING_LIST(0, \"refs\", &data.ref_filters, N_(\"pattern\"),\n \t\t\t\t   N_(\"only use refs matching <pattern>\")),\ndiff --git a/builtin/pack-objects.c b/builtin/pack-objects.c\nindex 7016b28485..414f9f0043 100644\n--- a/builtin/pack-objects.c\n+++ b/builtin/pack-objects.c\n@@ -3325,7 +3325,7 @@ static void get_object_list(int ac, const char **av)\n \t\t\tif (starts_with(line, \"--shallow \")) {\n \t\t\t\tstruct object_id oid;\n \t\t\t\tif (get_oid_hex(line + 10, &oid))\n-\t\t\t\t\tdie(\"not an SHA-1 '%s'\", line + 10);\n+\t\t\t\t\tdie(\"not an object name '%s'\", line + 10);\n \t\t\t\tregister_shallow(the_repository, &oid);\n \t\t\t\tuse_bitmap_index = 0;\n \t\t\t\tcontinue;\ndiff --git a/parse-options.h b/parse-options.h\nindex 46af942093..7030d8f3da 100644\n--- a/parse-options.h\n+++ b/parse-options.h\n@@ -314,7 +314,7 @@ int parse_opt_passthru_argv(const struct option *, const char *, int);\n #define OPT__FORCE(var, h, f) OPT_COUNTUP_F('f', \"force\",   (var), (h), (f))\n #define OPT__ABBREV(var)  \\\n \t{ OPTION_CALLBACK, 0, \"abbrev\", (var), N_(\"n\"),\t\\\n-\t  N_(\"use <n> digits to display SHA-1s\"),\t\\\n+\t  N_(\"use <n> digits to display object names\"),\t\\\n \t  PARSE_OPT_OPTARG, &parse_opt_abbrev_cb, 0 }\n #define OPT__COLOR(var, h) \\\n \tOPT_COLOR_FLAG(0, \"color\", (var), (h))\ndiff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh\nindex f8178ee4e3..14cafc138b 100755\n--- a/t/t0040-parse-options.sh\n+++ b/t/t0040-parse-options.sh\n@@ -44,7 +44,7 @@ Magic arguments\n     --no-ambiguous        negative ambiguity\n \n Standard options\n-    --abbrev[=<n>]        use <n> digits to display SHA-1s\n+    --abbrev[=<n>]        use <n> digits to display object names\n     -v, --verbose         be verbose\n     -n, --dry-run         dry run\n     -q, --quiet           be quiet\n-- \n2.28.0-336-ga1894b8832\n\n"}]}