diff mbox series

[11/34] doc txt & -h consistency: add "-z" to cat-file "-h"

Message ID	patch-11.34-698d8d3d53a-20220902T092734Z-avarab@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= <avarab@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Victoria Dye <vdye@github.com>, Taylor Blau <me@ttaylorr.com>, Emily Shaffer <emilyshaffer@google.com>, Jonathan Nieder <jrnieder@gmail.com>, John Cai <johncai86@gmail.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= <avarab@gmail.com> Subject: [PATCH 11/34] doc txt & -h consistency: add "-z" to cat-file "-h" Date: Mon, 5 Sep 2022 10:26:22 +0200 Message-Id: <patch-11.34-698d8d3d53a-20220902T092734Z-avarab@gmail.com> In-Reply-To: <cover-00.34-00000000000-20220902T092734Z-avarab@gmail.com> References: <cover-00.34-00000000000-20220902T092734Z-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	doc/UX: make txt & -h output more consistent \| expand [00/34] doc/UX: make txt & -h output more consistent [01/34] CodingGuidelines: update and clarify command-line conventions [02/34] builtin/bundle.c: use \t, not fix indentation 2-SP indentation [03/34] bundle: define subcommand -h in terms of command -h [04/34] blame: use a more detailed usage_msg_optf() error on bad -L [05/34] doc SYNOPSIS: don't use ' for subcommands [06/34] doc SYNOPSIS: consistently use ' for commands [07/34] doc SYNOPSIS & -h: fix incorrect alternates syntax [08/34] built-ins: consistently add "\n" between "usage" and options [09/34] doc txt & -h consistency: word-wrap [10/34] doc txt & -h consistency: fix incorrect alternates syntax [11/34] doc txt & -h consistency: add "-z" to cat-file "-h" [12/34] doc txt & -h consistency: add missing "]" to bugreport "-h" [13/34] doc txt & -h consistency: correct padding around "[]()" [14/34] stash doc SYNOPSIS & -h: correct padding around "[]()" [15/34] doc txt & -h consistency: use "<options>", not "<options>..." [16/34] t/helper/test-proc-receive.c: use "<options>", not "<options>..." [17/34] doc txt & -h consistency: fix mismatching labels [18/34] doc txt & -h consistency: add or fix optional "--" syntax [19/34] doc txt & -h consistency: make output order consistent [20/34] doc txt & -h consistency: add missing options and labels [21/34] doc txt & -h consistency: make "rerere" consistent [22/34] doc txt & -h consistency: make "read-tree" consistent [23/34] doc txt & -h consistency: make "bundle" consistent [24/34] doc txt & -h consistency: use "git foo" form, not "git-foo" [25/34] doc txt & -h consistency: add missing options [26/34] doc txt & -h consistency: make "stash" consistent [27/34] doc txt & -h consistency: make "annotate" consistent [28/34] doc txt & -h consistency: use "[<label>...]" for "zero or more" [29/34] doc txt & -h consistency: make "diff-tree" consistent [30/34] doc txt & -h consistency: make "commit" consistent [31/34] reflog doc: list real subcommands up-front [32/34] worktree: define subcommand -h in terms of command -h [33/34] doc txt & -h consistency: make "worktree" consistent [34/34] tests: start asserting that *.txt SYNOPSIS matches -h output

Commit Message

Ævar Arnfjörð Bjarmason Sept. 5, 2022, 8:26 a.m. UTC

Fix a bug in db9d67f2e9c (builtin/cat-file.c: support NUL-delimited
input with `-z`, 2022-07-22), before that change the SYNOPSIS and "-h"
output were the same, but not afterwards.

That change followed a similar earlier divergence in
473fa2df08d (Documentation: add --batch-command to cat-file synopsis,
2022-04-07). Subsequent commits will fix this sort of thing more
systematically, but let's fix this one as a one-off.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 builtin/cat-file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 989eee0bb4c..fa7bd891692 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -893,7 +893,7 @@  int cmd_cat_file(int argc, const char **argv, const char *prefix)
 		N_("git cat-file (-t | -s) [--allow-unknown-type] <object>"),
 		N_("git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]\n"
 		   "             [--buffer] [--follow-symlinks] [--unordered]\n"
-		   "             [--textconv | --filters]"),
+		   "             [--textconv | --filters] [-z]"),
 		N_("git cat-file (--textconv | --filters)\n"
 		   "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"),
 		NULL