diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-01-10 23:08:45 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-12 10:12:20 -0800 |
| commit | 83dc443439ca0fdc9f99fc1ed623d0749ef637ed (patch) | |
| tree | b8c55f893fb22bbf919e8c2388039c0de9c75341 /builtin/cat-file.c | |
| parent | 245b948815048821e73edc1a2b4224eaa94a8fc0 (diff) | |
| download | git-83dc443439ca0fdc9f99fc1ed623d0749ef637ed.tar.gz | |
cat-file: don't whitespace-pad "(...)" in SYNOPSIS and usage output
Fix up whitespace issues around "(... | ...)" in the SYNOPSIS and
usage. These were introduced in ab/cat-file series. See
e145efa6059 (Merge branch 'ab/cat-file' into next, 2022-01-05). In
particular 57d6a1cf96, 5a40417876 and 97fe7250753 in that series.
We'll now correctly emit this usage output:
$ git cat-file -h
usage: git cat-file <type> <object>
or: git cat-file (-e | -p) <object>
or: git cat-file (-t | -s) [--allow-unknown-type] <object>
[...]
Before this the last line of that would be inconsistent with the
preceding "(-e | -p)":
or: git cat-file ( -t | -s ) [--allow-unknown-type] <object>
Reported-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/cat-file.c')
| -rw-r--r-- | builtin/cat-file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index ad9b3eef4f..e36492235b 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -653,11 +653,11 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) const char * const usage[] = { N_("git cat-file <type> <object>"), N_("git cat-file (-e | -p) <object>"), - N_("git cat-file ( -t | -s ) [--allow-unknown-type] <object>"), + N_("git cat-file (-t | -s) [--allow-unknown-type] <object>"), N_("git cat-file (--batch | --batch-check) [--batch-all-objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" " [--textconv | --filters]"), - N_("git cat-file (--textconv | --filters )\n" + N_("git cat-file (--textconv | --filters)\n" " [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"), NULL }; @@ -699,7 +699,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) OPT_CMDMODE(0, "filters", &opt, N_("run filters on object's content"), 'w'), OPT_STRING(0, "path", &force_path, N_("blob|tree"), - N_("use a <path> for (--textconv | --filters ); Not with 'batch'")), + N_("use a <path> for (--textconv | --filters); Not with 'batch'")), OPT_END() }; |