зеркало из https://github.com/microsoft/git.git
receive-pack: gently write messages to proc-receive
Johannes found a flaky hang in `t5411/test-0013-bad-protocol.sh` in the
osx-clang job of the CI/PR builds, and ran into an issue when using
the `--stress` option with the following error messages:
fatal: unable to write flush packet: Broken pipe
send-pack: unexpected disconnect while reading sideband packet
fatal: the remote end hung up unexpectedly
In this test case, the "proc-receive" hook sends an error message and
dies earlier. While "receive-pack" on the other side of the pipe
should forward the error message of the "proc-receive" hook to the
client side, but it fails to do so. This is because "receive-pack"
uses `packet_write_fmt()` and `packet_flush()` to write pkt-line
message to "proc-receive" hook, and these functions die immediately
when pipe is broken. Using "gently" forms for these functions will get
more predicable output.
Add more "--die-*" options to test helper to test different stages of
the protocol between "receive-pack" and "proc-receive" hook.
Reported-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jiang Xin
Junio C Hamano
Родитель
cf3d868f35
Коммит
f65003b4c4
|
|
@ -977,15 +977,25 @@ static int read_proc_receive_report(struct packet_reader *reader,
|
|||
int new_report = 0;
|
||||
int code = 0;
|
||||
int once = 0;
|
||||
int response = 0;
|
||||
|
||||
for (;;) {
|
||||
struct object_id old_oid, new_oid;
|
||||
const char *head;
|
||||
const char *refname;
|
||||
char *p;
|
||||
enum packet_read_status status;
|
||||
|
||||
if (packet_reader_read(reader) != PACKET_READ_NORMAL)
|
||||
status = packet_reader_read(reader);
|
||||
if (status != PACKET_READ_NORMAL) {
|
||||
/* Check whether proc-receive exited abnormally */
|
||||
if (status == PACKET_READ_EOF && !response) {
|
||||
strbuf_addstr(errmsg, "proc-receive exited abnormally");
|
||||
return -1;
|
||||
}
|
||||
break;
|
||||
}
|
||||
response++;
|
||||
|
||||
head = reader->line;
|
||||
p = strchr(head, ' ');
|
||||
|
|
@ -1145,28 +1155,41 @@ static int run_proc_receive_hook(struct command *commands,
|
|||
if (use_push_options)
|
||||
strbuf_addstr(&cap, " push-options");
|
||||
if (cap.len) {
|
||||
packet_write_fmt(proc.in, "version=1%c%s\n", '\0', cap.buf + 1);
|
||||
code = packet_write_fmt_gently(proc.in, "version=1%c%s\n", '\0', cap.buf + 1);
|
||||
strbuf_release(&cap);
|
||||
} else {
|
||||
packet_write_fmt(proc.in, "version=1\n");
|
||||
code = packet_write_fmt_gently(proc.in, "version=1\n");
|
||||
}
|
||||
packet_flush(proc.in);
|
||||
if (!code)
|
||||
code = packet_flush_gently(proc.in);
|
||||
|
||||
for (;;) {
|
||||
int linelen;
|
||||
if (!code)
|
||||
for (;;) {
|
||||
int linelen;
|
||||
enum packet_read_status status;
|
||||
|
||||
if (packet_reader_read(&reader) != PACKET_READ_NORMAL)
|
||||
break;
|
||||
status = packet_reader_read(&reader);
|
||||
if (status != PACKET_READ_NORMAL) {
|
||||
/* Check whether proc-receive exited abnormally */
|
||||
if (status == PACKET_READ_EOF)
|
||||
code = -1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (reader.pktlen > 8 && starts_with(reader.line, "version=")) {
|
||||
version = atoi(reader.line + 8);
|
||||
linelen = strlen(reader.line);
|
||||
if (linelen < reader.pktlen) {
|
||||
const char *feature_list = reader.line + linelen + 1;
|
||||
if (parse_feature_request(feature_list, "push-options"))
|
||||
hook_use_push_options = 1;
|
||||
if (reader.pktlen > 8 && starts_with(reader.line, "version=")) {
|
||||
version = atoi(reader.line + 8);
|
||||
linelen = strlen(reader.line);
|
||||
if (linelen < reader.pktlen) {
|
||||
const char *feature_list = reader.line + linelen + 1;
|
||||
if (parse_feature_request(feature_list, "push-options"))
|
||||
hook_use_push_options = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (code) {
|
||||
strbuf_addstr(&errmsg, "fail to negotiate version with proc-receive hook");
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (version != 1) {
|
||||
|
|
@ -1180,20 +1203,36 @@ static int run_proc_receive_hook(struct command *commands,
|
|||
for (cmd = commands; cmd; cmd = cmd->next) {
|
||||
if (!cmd->run_proc_receive || cmd->skip_update || cmd->error_string)
|
||||
continue;
|
||||
packet_write_fmt(proc.in, "%s %s %s",
|
||||
oid_to_hex(&cmd->old_oid),
|
||||
oid_to_hex(&cmd->new_oid),
|
||||
cmd->ref_name);
|
||||
code = packet_write_fmt_gently(proc.in, "%s %s %s",
|
||||
oid_to_hex(&cmd->old_oid),
|
||||
oid_to_hex(&cmd->new_oid),
|
||||
cmd->ref_name);
|
||||
if (code)
|
||||
break;
|
||||
}
|
||||
if (!code)
|
||||
code = packet_flush_gently(proc.in);
|
||||
if (code) {
|
||||
strbuf_addstr(&errmsg, "fail to write commands to proc-receive hook");
|
||||
goto cleanup;
|
||||
}
|
||||
packet_flush(proc.in);
|
||||
|
||||
/* Send push options */
|
||||
if (hook_use_push_options) {
|
||||
struct string_list_item *item;
|
||||
|
||||
for_each_string_list_item(item, push_options)
|
||||
packet_write_fmt(proc.in, "%s", item->string);
|
||||
packet_flush(proc.in);
|
||||
for_each_string_list_item(item, push_options) {
|
||||
code = packet_write_fmt_gently(proc.in, "%s", item->string);
|
||||
if (code)
|
||||
break;
|
||||
}
|
||||
if (!code)
|
||||
code = packet_flush_gently(proc.in);
|
||||
if (code) {
|
||||
strbuf_addstr(&errmsg,
|
||||
"fail to write push-options to proc-receive hook");
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
|
||||
/* Read result from proc-receive */
|
||||
|
|
|
|||
|
|
@ -10,8 +10,11 @@ static const char *proc_receive_usage[] = {
|
|||
NULL
|
||||
};
|
||||
|
||||
static int die_version;
|
||||
static int die_readline;
|
||||
static int die_read_version;
|
||||
static int die_write_version;
|
||||
static int die_read_commands;
|
||||
static int die_read_push_options;
|
||||
static int die_write_report;
|
||||
static int no_push_options;
|
||||
static int use_atomic;
|
||||
static int use_push_options;
|
||||
|
|
@ -33,6 +36,9 @@ struct command {
|
|||
static void proc_receive_verison(struct packet_reader *reader) {
|
||||
int server_version = 0;
|
||||
|
||||
if (die_read_version)
|
||||
die("die with the --die-read-version option");
|
||||
|
||||
for (;;) {
|
||||
int linelen;
|
||||
|
||||
|
|
@ -52,9 +58,12 @@ static void proc_receive_verison(struct packet_reader *reader) {
|
|||
}
|
||||
}
|
||||
|
||||
if (server_version != 1 || die_version)
|
||||
if (server_version != 1)
|
||||
die("bad protocol version: %d", server_version);
|
||||
|
||||
if (die_write_version)
|
||||
die("die with the --die-write-version option");
|
||||
|
||||
packet_write_fmt(1, "version=%d%c%s\n",
|
||||
version, '\0',
|
||||
use_push_options && !no_push_options ? "push-options": "");
|
||||
|
|
@ -75,11 +84,13 @@ static void proc_receive_read_commands(struct packet_reader *reader,
|
|||
if (packet_reader_read(reader) != PACKET_READ_NORMAL)
|
||||
break;
|
||||
|
||||
if (die_read_commands)
|
||||
die("die with the --die-read-commands option");
|
||||
|
||||
if (parse_oid_hex(reader->line, &old_oid, &p) ||
|
||||
*p++ != ' ' ||
|
||||
parse_oid_hex(p, &new_oid, &p) ||
|
||||
*p++ != ' ' ||
|
||||
die_readline)
|
||||
*p++ != ' ')
|
||||
die("protocol error: expected 'old new ref', got '%s'",
|
||||
reader->line);
|
||||
refname = p;
|
||||
|
|
@ -99,6 +110,9 @@ static void proc_receive_read_push_options(struct packet_reader *reader,
|
|||
if (no_push_options || !use_push_options)
|
||||
return;
|
||||
|
||||
if (die_read_push_options)
|
||||
die("die with the --die-read-push-options option");
|
||||
|
||||
while (1) {
|
||||
if (packet_reader_read(reader) != PACKET_READ_NORMAL)
|
||||
break;
|
||||
|
|
@ -117,10 +131,16 @@ int cmd__proc_receive(int argc, const char **argv)
|
|||
struct option options[] = {
|
||||
OPT_BOOL(0, "no-push-options", &no_push_options,
|
||||
"disable push options"),
|
||||
OPT_BOOL(0, "die-version", &die_version,
|
||||
"die during version negotiation"),
|
||||
OPT_BOOL(0, "die-readline", &die_readline,
|
||||
"die when readline"),
|
||||
OPT_BOOL(0, "die-read-version", &die_read_version,
|
||||
"die when reading version"),
|
||||
OPT_BOOL(0, "die-write-version", &die_write_version,
|
||||
"die when writing version"),
|
||||
OPT_BOOL(0, "die-read-commands", &die_read_commands,
|
||||
"die when reading commands"),
|
||||
OPT_BOOL(0, "die-read-push-options", &die_read_push_options,
|
||||
"die when reading push-options"),
|
||||
OPT_BOOL(0, "die-write-report", &die_write_report,
|
||||
"die when writing report"),
|
||||
OPT_STRING_LIST('r', "return", &returns, "old/new/ref/status/msg",
|
||||
"return of results"),
|
||||
OPT__VERBOSE(&verbose, "be verbose"),
|
||||
|
|
@ -136,7 +156,7 @@ int cmd__proc_receive(int argc, const char **argv)
|
|||
usage_msg_opt("Too many arguments.", proc_receive_usage, options);
|
||||
packet_reader_init(&reader, 0, NULL, 0,
|
||||
PACKET_READ_CHOMP_NEWLINE |
|
||||
PACKET_READ_DIE_ON_ERR_PACKET);
|
||||
PACKET_READ_GENTLE_ON_EOF);
|
||||
|
||||
sigchain_push(SIGPIPE, SIG_IGN);
|
||||
proc_receive_verison(&reader);
|
||||
|
|
@ -166,6 +186,8 @@ int cmd__proc_receive(int argc, const char **argv)
|
|||
fprintf(stderr, "proc-receive> %s\n", item->string);
|
||||
}
|
||||
|
||||
if (die_write_report)
|
||||
die("die with the --die-write-report option");
|
||||
if (returns.nr)
|
||||
for_each_string_list_item(item, &returns)
|
||||
packet_write_fmt(1, "%s\n", item->string);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" '
|
|||
|
||||
# Check status report for git-push
|
||||
sed -n \
|
||||
-e "/^To / { p; n; p; }" \
|
||||
-e "/^To / { p; }" \
|
||||
-e "/^ ! / { p; }" \
|
||||
<actual >actual-report &&
|
||||
cat >expect <<-EOF &&
|
||||
To <URL/of/upstream.git>
|
||||
|
|
@ -41,32 +42,31 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" '
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success "setup proc-receive hook (hook --die-version, $PROTOCOL)" '
|
||||
test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL)" '
|
||||
write_script "$upstream/hooks/proc-receive" <<-EOF
|
||||
printf >&2 "# proc-receive hook\n"
|
||||
test-tool proc-receive -v --die-version
|
||||
test-tool proc-receive -v --die-read-version
|
||||
EOF
|
||||
'
|
||||
|
||||
# Refs of upstream : main(A)
|
||||
# Refs of workbench: main(A) tags/v123
|
||||
# git push : refs/for/main/topic(A)
|
||||
test_expect_success "proc-receive: bad protocol (hook --die-version, $PROTOCOL)" '
|
||||
test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTOCOL)" '
|
||||
test_must_fail git -C workbench push origin \
|
||||
HEAD:refs/for/main/topic \
|
||||
>out 2>&1 &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
|
||||
filter_out_user_friendly_and_stable_output \
|
||||
-e "/^To / { p; }" \
|
||||
-e "/^ ! / { p; }" \
|
||||
<out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
remote: # pre-receive hook
|
||||
remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
|
||||
remote: # proc-receive hook
|
||||
remote: fatal: bad protocol version: 1
|
||||
remote: error: proc-receive version "0" is not supported
|
||||
To <URL/of/upstream.git>
|
||||
! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
grep "remote: fatal: die with the --die-read-version option" out &&
|
||||
grep "remote: error: fail to negotiate version with proc-receive hook" out &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
|
|
@ -76,23 +76,132 @@ test_expect_success "proc-receive: bad protocol (hook --die-version, $PROTOCOL)"
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success "setup proc-receive hook (hook --die-readline, $PROTOCOL)" '
|
||||
test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL)" '
|
||||
write_script "$upstream/hooks/proc-receive" <<-EOF
|
||||
printf >&2 "# proc-receive hook\n"
|
||||
test-tool proc-receive -v --die-readline
|
||||
test-tool proc-receive -v --die-write-version
|
||||
EOF
|
||||
'
|
||||
|
||||
# Refs of upstream : main(A)
|
||||
# Refs of workbench: main(A) tags/v123
|
||||
# git push : refs/for/main/topic(A)
|
||||
test_expect_success "proc-receive: bad protocol (hook --die-readline, $PROTOCOL)" '
|
||||
test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROTOCOL)" '
|
||||
test_must_fail git -C workbench push origin \
|
||||
HEAD:refs/for/main/topic \
|
||||
>out 2>&1 &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
filter_out_user_friendly_and_stable_output \
|
||||
-e "/^To / { p; }" \
|
||||
-e "/^ ! / { p; }" \
|
||||
<out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
To <URL/of/upstream.git>
|
||||
! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
grep "remote: fatal: die with the --die-write-version option" out &&
|
||||
grep "remote: error: fail to negotiate version with proc-receive hook" out &&
|
||||
|
||||
grep "remote: fatal: protocol error: expected \"old new ref\", got \"<ZERO-OID> <COMMIT-A> refs/for/main/topic\"" actual &&
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
<COMMIT-A> refs/heads/main
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL)" '
|
||||
write_script "$upstream/hooks/proc-receive" <<-EOF
|
||||
printf >&2 "# proc-receive hook\n"
|
||||
test-tool proc-receive -v --die-read-commands
|
||||
EOF
|
||||
'
|
||||
|
||||
# Refs of upstream : main(A)
|
||||
# Refs of workbench: main(A) tags/v123
|
||||
# git push : refs/for/main/topic(A)
|
||||
test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROTOCOL)" '
|
||||
test_must_fail git -C workbench push origin \
|
||||
HEAD:refs/for/main/topic \
|
||||
>out 2>&1 &&
|
||||
filter_out_user_friendly_and_stable_output \
|
||||
-e "/^To / { p; }" \
|
||||
-e "/^ ! / { p; }" \
|
||||
<out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
To <URL/of/upstream.git>
|
||||
! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
grep "remote: fatal: die with the --die-read-commands option" out &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
<COMMIT-A> refs/heads/main
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL)" '
|
||||
write_script "$upstream/hooks/proc-receive" <<-EOF
|
||||
printf >&2 "# proc-receive hook\n"
|
||||
test-tool proc-receive -v --die-read-push-options
|
||||
EOF
|
||||
'
|
||||
|
||||
# Refs of upstream : main(A)
|
||||
# Refs of workbench: main(A) tags/v123
|
||||
# git push : refs/for/main/topic(A)
|
||||
test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $PROTOCOL)" '
|
||||
git -C "$upstream" config receive.advertisePushOptions true &&
|
||||
test_must_fail git -C workbench push origin \
|
||||
-o reviewers=user1,user2 \
|
||||
HEAD:refs/for/main/topic \
|
||||
>out 2>&1 &&
|
||||
filter_out_user_friendly_and_stable_output \
|
||||
-e "/^To / { p; }" \
|
||||
-e "/^ ! / { p; }" \
|
||||
<out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
To <URL/of/upstream.git>
|
||||
! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
grep "remote: fatal: die with the --die-read-push-options option" out &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
<COMMIT-A> refs/heads/main
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL)" '
|
||||
write_script "$upstream/hooks/proc-receive" <<-EOF
|
||||
printf >&2 "# proc-receive hook\n"
|
||||
test-tool proc-receive -v --die-write-report
|
||||
EOF
|
||||
'
|
||||
|
||||
# Refs of upstream : main(A)
|
||||
# Refs of workbench: main(A) tags/v123
|
||||
# git push : refs/for/main/topic(A)
|
||||
test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTOCOL)" '
|
||||
test_must_fail git -C workbench push origin \
|
||||
HEAD:refs/for/main/topic \
|
||||
>out 2>&1 &&
|
||||
filter_out_user_friendly_and_stable_output \
|
||||
-e "/^To / { p; }" \
|
||||
-e "/^ ! / { p; }" \
|
||||
<out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
To <URL/of/upstream.git>
|
||||
! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
grep "remote: fatal: die with the --die-write-report option" out &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
|
|
@ -130,6 +239,7 @@ test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL)" '
|
|||
! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
|
|
@ -173,6 +283,7 @@ test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL)" '
|
|||
! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
|
|
@ -208,6 +319,7 @@ test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL)" '
|
|||
! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
|
|
|
|||
|
|
@ -42,6 +42,175 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porc
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL/porcelain)" '
|
||||
write_script "$upstream/hooks/proc-receive" <<-EOF
|
||||
printf >&2 "# proc-receive hook\n"
|
||||
test-tool proc-receive -v --die-read-version
|
||||
EOF
|
||||
'
|
||||
|
||||
# Refs of upstream : main(A)
|
||||
# Refs of workbench: main(A) tags/v123
|
||||
# git push : refs/for/main/topic(A)
|
||||
test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTOCOL/porcelain)" '
|
||||
test_must_fail git -C workbench push --porcelain origin \
|
||||
HEAD:refs/for/main/topic \
|
||||
>out 2>&1 &&
|
||||
filter_out_user_friendly_and_stable_output \
|
||||
-e "/^To / { p; n; p; n; p; }" \
|
||||
<out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
To <URL/of/upstream.git>
|
||||
! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
|
||||
Done
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
grep "remote: fatal: die with the --die-read-version option" out &&
|
||||
grep "remote: error: fail to negotiate version with proc-receive hook" out &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
<COMMIT-A> refs/heads/main
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL/porcelain)" '
|
||||
write_script "$upstream/hooks/proc-receive" <<-EOF
|
||||
printf >&2 "# proc-receive hook\n"
|
||||
test-tool proc-receive -v --die-write-version
|
||||
EOF
|
||||
'
|
||||
|
||||
# Refs of upstream : main(A)
|
||||
# Refs of workbench: main(A) tags/v123
|
||||
# git push : refs/for/main/topic(A)
|
||||
test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROTOCOL/porcelain)" '
|
||||
test_must_fail git -C workbench push --porcelain origin \
|
||||
HEAD:refs/for/main/topic \
|
||||
>out 2>&1 &&
|
||||
filter_out_user_friendly_and_stable_output \
|
||||
-e "/^To / { p; n; p; n; p; }" \
|
||||
<out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
To <URL/of/upstream.git>
|
||||
! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
|
||||
Done
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
grep "remote: fatal: die with the --die-write-version option" out &&
|
||||
grep "remote: error: fail to negotiate version with proc-receive hook" out &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
<COMMIT-A> refs/heads/main
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL/porcelain)" '
|
||||
write_script "$upstream/hooks/proc-receive" <<-EOF
|
||||
printf >&2 "# proc-receive hook\n"
|
||||
test-tool proc-receive -v --die-read-commands
|
||||
EOF
|
||||
'
|
||||
|
||||
# Refs of upstream : main(A)
|
||||
# Refs of workbench: main(A) tags/v123
|
||||
# git push : refs/for/main/topic(A)
|
||||
test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROTOCOL/porcelain)" '
|
||||
test_must_fail git -C workbench push --porcelain origin \
|
||||
HEAD:refs/for/main/topic \
|
||||
>out 2>&1 &&
|
||||
filter_out_user_friendly_and_stable_output \
|
||||
-e "/^To / { p; n; p; n; p; }" \
|
||||
<out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
To <URL/of/upstream.git>
|
||||
! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
|
||||
Done
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
grep "remote: fatal: die with the --die-read-commands option" out &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
<COMMIT-A> refs/heads/main
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL/porcelain)" '
|
||||
write_script "$upstream/hooks/proc-receive" <<-EOF
|
||||
printf >&2 "# proc-receive hook\n"
|
||||
test-tool proc-receive -v --die-read-push-options
|
||||
EOF
|
||||
'
|
||||
|
||||
# Refs of upstream : main(A)
|
||||
# Refs of workbench: main(A) tags/v123
|
||||
# git push : refs/for/main/topic(A)
|
||||
test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $PROTOCOL/porcelain)" '
|
||||
git -C "$upstream" config receive.advertisePushOptions true &&
|
||||
test_must_fail git -C workbench push --porcelain origin \
|
||||
-o reviewers=user1,user2 \
|
||||
HEAD:refs/for/main/topic \
|
||||
>out 2>&1 &&
|
||||
filter_out_user_friendly_and_stable_output \
|
||||
-e "/^To / { p; n; p; n; p; }" \
|
||||
<out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
To <URL/of/upstream.git>
|
||||
! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
|
||||
Done
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
grep "remote: fatal: die with the --die-read-push-options option" out &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
<COMMIT-A> refs/heads/main
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL/porcelain)" '
|
||||
write_script "$upstream/hooks/proc-receive" <<-EOF
|
||||
printf >&2 "# proc-receive hook\n"
|
||||
test-tool proc-receive -v --die-write-report
|
||||
EOF
|
||||
'
|
||||
|
||||
# Refs of upstream : main(A)
|
||||
# Refs of workbench: main(A) tags/v123
|
||||
# git push : refs/for/main/topic(A)
|
||||
test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTOCOL/porcelain)" '
|
||||
test_must_fail git -C workbench push --porcelain origin \
|
||||
HEAD:refs/for/main/topic \
|
||||
>out 2>&1 &&
|
||||
filter_out_user_friendly_and_stable_output \
|
||||
-e "/^To / { p; n; p; n; p; }" \
|
||||
<out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
To <URL/of/upstream.git>
|
||||
! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
|
||||
Done
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
grep "remote: fatal: die with the --die-write-report option" out &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
<COMMIT-A> refs/heads/main
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success "setup proc-receive hook (no report, $PROTOCOL/porcelain)" '
|
||||
write_script "$upstream/hooks/proc-receive" <<-EOF
|
||||
printf >&2 "# proc-receive hook\n"
|
||||
|
|
@ -71,6 +240,7 @@ test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL/porcelain)
|
|||
Done
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
|
|
@ -84,7 +254,6 @@ test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL/porcelain)
|
|||
# Refs of workbench: main(A) tags/v123
|
||||
test_expect_success "cleanup ($PROTOCOL/porcelain)" '
|
||||
git -C "$upstream" update-ref -d refs/heads/next
|
||||
|
||||
'
|
||||
|
||||
test_expect_success "setup proc-receive hook (no ref, $PROTOCOL/porcelain)" '
|
||||
|
|
@ -115,6 +284,7 @@ test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" '
|
|||
Done
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
|
|
@ -151,6 +321,7 @@ test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL/porce
|
|||
Done
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
|
||||
git -C "$upstream" show-ref >out &&
|
||||
make_user_friendly_and_stable_output <out >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче