kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t/helper: remove dependency on `the_repository` in "proc-receive" 

The "proc-receive" test helper implicitly relies on `the_repository` via
`parse_oid_hex()`. This isn't necessary though, and in fact the whole
command does not depend on `the_repository` at all.

Stop setting up `the_repository` and use `parse_oid_hex_any()` to parse
object IDs.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2024-06-14 08:51:10 +02:00 committed by Junio C Hamano
parent 8e9a1d0dc2
commit 912d4756cd
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,8 +3,8 @@
#include "hex.h" #include "hex.h"
#include "parse-options.h" #include "parse-options.h"
#include "pkt-line.h" #include "pkt-line.h"
#include "setup.h"
#include "sigchain.h" #include "sigchain.h"
#include "string-list.h"


static const char *proc_receive_usage[] = { static const char *proc_receive_usage[] = {
"test-tool proc-receive [<options>]", "test-tool proc-receive [<options>]",
@ -92,9 +92,9 @@ static void proc_receive_read_commands(struct packet_reader *reader,
if (die_read_commands) if (die_read_commands)
die("die with the --die-read-commands option"); die("die with the --die-read-commands option");


if (parse_oid_hex(reader->line, &old_oid, &p) || if (parse_oid_hex_any(reader->line, &old_oid, &p) == GIT_HASH_UNKNOWN ||
*p++ != ' ' || *p++ != ' ' ||
parse_oid_hex(p, &new_oid, &p) || parse_oid_hex_any(p, &new_oid, &p) == GIT_HASH_UNKNOWN ||
*p++ != ' ') *p++ != ' ')
die("protocol error: expected 'old new ref', got '%s'", die("protocol error: expected 'old new ref', got '%s'",
reader->line); reader->line);
@ -128,7 +128,6 @@ static void proc_receive_read_push_options(struct packet_reader *reader,


int cmd__proc_receive(int argc, const char **argv) int cmd__proc_receive(int argc, const char **argv)
{ {
int nongit_ok = 0;
struct packet_reader reader; struct packet_reader reader;
struct command *commands = NULL; struct command *commands = NULL;
struct string_list push_options = STRING_LIST_INIT_DUP; struct string_list push_options = STRING_LIST_INIT_DUP;
@ -154,8 +153,6 @@ int cmd__proc_receive(int argc, const char **argv)
OPT_END() OPT_END()
}; };


setup_git_directory_gently(&nongit_ok);

argc = parse_options(argc, argv, "test-tools", options, proc_receive_usage, 0); argc = parse_options(argc, argv, "test-tools", options, proc_receive_usage, 0);
if (argc > 0) if (argc > 0)
usage_msg_opt("Too many arguments.", proc_receive_usage, options); usage_msg_opt("Too many arguments.", proc_receive_usage, options);