mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cat-file: don't whitespace-pad "(...)" in SYNOPSIS and usage output

Browse Source 
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 97fe725075 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>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2022-01-10 23:08:45 +01:00
committed by Junio C Hamano
parent 245b948815
commit 83dc443439
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-cat-file.txt
View File

@ -11,11 +11,11 @@ SYNOPSIS
[verse] [verse]
'git cat-file' <type> <object> 'git cat-file' <type> <object>
'git cat-file' (-e | -p) <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] 'git cat-file' (--batch | --batch-check) [--batch-all-objects]
[--buffer] [--follow-symlinks] [--unordered] [--buffer] [--follow-symlinks] [--unordered]
[--textconv | --filters] [--textconv | --filters]
'git cat-file' (--textconv | --filters ) 'git cat-file' (--textconv | --filters)
[<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>] [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
DESCRIPTION DESCRIPTION

6
builtin/cat-file.c
View File

@ -653,11 +653,11 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
const char * const usage[] = { const char * const usage[] = {
N_("git cat-file <type> <object>"), N_("git cat-file <type> <object>"),
N_("git cat-file (-e | -p) <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" N_("git cat-file (--batch | --batch-check) [--batch-all-objects]\n"
" [--buffer] [--follow-symlinks] [--unordered]\n" " [--buffer] [--follow-symlinks] [--unordered]\n"
" [--textconv | --filters]"), " [--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>]"), " [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"),
NULL NULL
}; };
@ -699,7 +699,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
OPT_CMDMODE(0, "filters", &opt, OPT_CMDMODE(0, "filters", &opt,
N_("run filters on object's content"), 'w'), N_("run filters on object's content"), 'w'),
OPT_STRING(0, "path", &force_path, N_("blob|tree"), 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() OPT_END()
}; };