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@xxxxxxxxx> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> --- Documentation/git-cat-file.txt | 4 ++-- builtin/cat-file.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index 73ebbc70ee2..bef76f4dd06 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -11,11 +11,11 @@ SYNOPSIS [verse] 'git cat-file' <type> <object> 'git cat-file' (-e | -p) <object> -'git cat-file' ( -t | -s ) [--allow-unknown-type] <object> +'git cat-file' (-t | -s) [--allow-unknown-type] <object> 'git cat-file' (--batch | --batch-check) [--batch-all-objects] [--buffer] [--follow-symlinks] [--unordered] [--textconv | --filters] -'git cat-file' (--textconv | --filters ) +'git cat-file' (--textconv | --filters) [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>] DESCRIPTION diff --git a/builtin/cat-file.c b/builtin/cat-file.c index ad9b3eef4f4..e36492235ba 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() }; -- 2.34.1.1373.g062f5534af2