Merge branch 'tb/cat-file-z'

Operating modes like "--batch" of "git cat-file" command learned to
take NUL-terminated input, instead of one-item-per-line.

* tb/cat-file-z:
  builtin/cat-file.c: support NUL-delimited input with `-z`
  t1006: extract --batch-command inputs to variables
pull/1306/head
Junio C Hamano 2 months ago
commit 1e92768aa1
  1. 7
      Documentation/git-cat-file.txt
  2. 28
      builtin/cat-file.c
  3. 72
      t/t1006-cat-file.sh

@ -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>]
@ -213,6 +213,11 @@ respectively print:
/etc/passwd
--
-z::
Only meaningful with `--batch`, `--batch-check`, or
`--batch-command`; input is NUL-delimited instead of
newline-delimited.
OUTPUT
------

@ -32,6 +32,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;
};
@ -650,12 +651,20 @@ static void batch_objects_command(struct batch_options *opt,
struct queued_cmd *queued_cmd = NULL;
size_t alloc = 0, nr = 0;
while (!strbuf_getline(&input, stdin)) {
int i;
while (1) {
int i, ret;
const struct parse_cmd *cmd = NULL;
const char *p = NULL, *cmd_end;
struct queued_cmd call = {0};
if (opt->nul_terminated)
ret = strbuf_getline_nul(&input, stdin);
else
ret = strbuf_getline(&input, stdin);
if (ret)
break;
if (!input.len)
die(_("empty command in input"));
if (isspace(*input.buf))
@ -799,7 +808,16 @@ static int batch_objects(struct batch_options *opt)
goto cleanup;
}
while (strbuf_getline(&input, stdin) != EOF) {
while (1) {
int ret;
if (opt->nul_terminated)
ret = strbuf_getline_nul(&input, stdin);
else
ret = strbuf_getline(&input, stdin);
if (ret == EOF)
break;
if (data.split_on_whitespace) {
/*
* Split at first whitespace, tying off the beginning
@ -904,6 +922,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
N_("like --batch, but don't emit <contents>"),
PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
batch_option_callback),
OPT_BOOL('z', NULL, &batch.nul_terminated, N_("stdin is NUL-terminated")),
OPT_CALLBACK_F(0, "batch-command", &batch, N_("format"),
N_("read commands from stdin"),
PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
@ -962,6 +981,9 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
else if (batch.all_objects)
usage_msg_optf(_("'%s' requires a batch mode"), usage, options,
"--batch-all-objects");
else if (batch.nul_terminated)
usage_msg_optf(_("'%s' requires a batch mode"), usage, options,
"-z");
/* Batch defaults */
if (batch.buffer_output < 0)

@ -88,7 +88,8 @@ done
for opt in --buffer \
--follow-symlinks \
--batch-all-objects
--batch-all-objects \
-z
do
test_expect_success "usage: bad option combination: $opt without batch mode" '
test_incompatible_usage git cat-file $opt &&
@ -100,6 +101,10 @@ echo_without_newline () {
printf '%s' "$*"
}
echo_without_newline_nul () {
echo_without_newline "$@" | tr '\n' '\0'
}
strlen () {
echo_without_newline "$1" | wc -c | sed -e 's/^ *//'
}
@ -398,6 +403,12 @@ test_expect_success '--batch with multiple sha1s gives correct format' '
test "$(maybe_remove_timestamp "$batch_output" 1)" = "$(maybe_remove_timestamp "$(echo_without_newline "$batch_input" | git cat-file --batch)" 1)"
'
test_expect_success '--batch, -z with multiple sha1s gives correct format' '
echo_without_newline_nul "$batch_input" >in &&
test "$(maybe_remove_timestamp "$batch_output" 1)" = \
"$(maybe_remove_timestamp "$(git cat-file --batch -z <in)" 1)"
'
batch_check_input="$hello_sha1
$tree_sha1
$commit_sha1
@ -418,6 +429,30 @@ test_expect_success "--batch-check with multiple sha1s gives correct format" '
"$(echo_without_newline "$batch_check_input" | git cat-file --batch-check)"
'
test_expect_success "--batch-check, -z with multiple sha1s gives correct format" '
echo_without_newline_nul "$batch_check_input" >in &&
test "$batch_check_output" = "$(git cat-file --batch-check -z <in)"
'
test_expect_success FUNNYNAMES '--batch-check, -z with newline in input' '
touch -- "newline${LF}embedded" &&
git add -- "newline${LF}embedded" &&
git commit -m "file with newline embedded" &&
test_tick &&
printf "HEAD:newline${LF}embedded" >in &&
git cat-file --batch-check -z <in >actual &&
echo "$(git rev-parse "HEAD:newline${LF}embedded") blob 0" >expect &&
test_cmp expect actual
'
batch_command_multiple_info="info $hello_sha1
info $tree_sha1
info $commit_sha1
info $tag_sha1
info deadbeef"
test_expect_success '--batch-command with multiple info calls gives correct format' '
cat >expect <<-EOF &&
$hello_sha1 blob $hello_size
@ -427,17 +462,23 @@ test_expect_success '--batch-command with multiple info calls gives correct form
deadbeef missing
EOF
git cat-file --batch-command --buffer >actual <<-EOF &&
info $hello_sha1
info $tree_sha1
info $commit_sha1
info $tag_sha1
info deadbeef
EOF
echo "$batch_command_multiple_info" >in &&
git cat-file --batch-command --buffer <in >actual &&
test_cmp expect actual &&
echo "$batch_command_multiple_info" | tr "\n" "\0" >in &&
git cat-file --batch-command --buffer -z <in >actual &&
test_cmp expect actual
'
batch_command_multiple_contents="contents $hello_sha1
contents $commit_sha1
contents $tag_sha1
contents deadbeef
flush"
test_expect_success '--batch-command with multiple command calls gives correct format' '
remove_timestamp >expect <<-EOF &&
$hello_sha1 blob $hello_size
@ -449,13 +490,14 @@ test_expect_success '--batch-command with multiple command calls gives correct f
deadbeef missing
EOF
git cat-file --batch-command --buffer >actual_raw <<-EOF &&
contents $hello_sha1
contents $commit_sha1
contents $tag_sha1
contents deadbeef
flush
EOF
echo "$batch_command_multiple_contents" >in &&
git cat-file --batch-command --buffer <in >actual_raw &&
remove_timestamp <actual_raw >actual &&
test_cmp expect actual &&
echo "$batch_command_multiple_contents" | tr "\n" "\0" >in &&
git cat-file --batch-command --buffer -z <in >actual_raw &&
remove_timestamp <actual_raw >actual &&
test_cmp expect actual

Loading…
Cancel
Save