Re: [PATCH 2/2] builtin/cat-file.c: support NUL-delimited input with `-z`
On Fri, Jul 22 2022, Taylor Blau wrote:
This change:
Show 25 quoted lines
> diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
> index 24a811f0ef..3515350ed6 100644
> --- a/Documentation/git-cat-file.txt
> +++ b/Documentation/git-cat-file.txt
> @@ -14,7 +14,7 @@ SYNOPSIS
> 'git cat-file' (-t | -s) [--allow-unknown-type] <object>
> 'git cat-file' (--batch | --batch-check | --batch-command) [--batch-all-objects]
> [--buffer] [--follow-symlinks] [--unordered]
> - [--textconv | --filters]
> + [--textconv | --filters] [-z]
> 'git cat-file' (--textconv | --filters)
> [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
>
> [...]
> diff --git a/builtin/cat-file.c b/builtin/cat-file.c
> index f42782e955..c3602d15df 100644
> --- a/builtin/cat-file.c
> +++ b/builtin/cat-file.c
> @@ -31,6 +31,7 @@ struct batch_options {
> int all_objects;
> int unordered;
> int transform_mode; /* may be 'w' or 'c' for --filters or --textconv */
> + int nul_terminated;
> const char *format;
> };Is missing a corresponding change to the -h output here. Before this
they were the same, but now:
+ diff -u txt help
--- txt 2022-08-11 11:53:00.235221628 +0000
+++ help 2022-08-11 11:53:00.239221594 +0000
@@ -3,6 +3,6 @@
git cat-file (-t | -s) [--allow-unknown-type] <object>
git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
[--buffer] [--follow-symlinks] [--unordered]
- [--textconv | --filters] [-z]
+ [--textconv | --filters]
git cat-file (--textconv | --filters)
[<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
(Spotted with some local patches of mine which automatically check this)
Ævar Arnfjörð Bjarmason <avarab@gmail.com>