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

Merge branch 'jx/t5411-flake-fix'

Browse Source 
The exchange between receive-pack and proc-receive hook did not
carefully check for errors.

* jx/t5411-flake-fix:
  receive-pack: use default version 0 for proc-receive
  receive-pack: gently write messages to proc-receive
  t5411: new helper filter_out_user_friendly_and_stable_output
This commit is contained in:
Junio C Hamano
2020-11-25 15:24:52 -08:00
parent 455e8d18f8 80ffeb94f4
commit 8f8f10ac09
9 changed files with 547 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
t/helper/test-proc-receive.c
View File

@ -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,14 +36,23 @@ 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;
if (packet_reader_read(reader) != PACKET_READ_NORMAL)
break;
/* Ignore version negotiation for version 0 */
if (version == 0)
continue;
if (reader->pktlen > 8 && starts_with(reader->line, "version=")) {
server_version = atoi(reader->line+8);
if (server_version != 1)
die("bad protocol version: %d", server_version);
linelen = strlen(reader->line);
if (linelen < reader->pktlen) {
const char *feature_list = reader->line + linelen + 1;
@ -52,12 +64,13 @@ static void proc_receive_verison(struct packet_reader *reader) {
}
}
if (server_version != 1 || die_version)
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": "");
if (version != 0)
packet_write_fmt(1, "version=%d%c%s\n",
version, '\0',
use_push_options && !no_push_options ? "push-options": "");
packet_flush(1);
}
@ -75,11 +88,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 +114,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 +135,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 +160,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 +190,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);