]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t/helper: remove dependency on `the_repository` in "proc-receive"
authorPatrick Steinhardt <ps@pks.im>
Fri, 14 Jun 2024 06:51:10 +0000 (08:51 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2024 17:26:35 +0000 (10:26 -0700)
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>
t/helper/test-proc-receive.c

index f30022d2225b0a81cb026a9ccc24366ebdb9d2b4..29361c7aab72760b600684e3b5ef28b2a9168c23 100644 (file)
@@ -3,8 +3,8 @@
 #include "hex.h"
 #include "parse-options.h"
 #include "pkt-line.h"
-#include "setup.h"
 #include "sigchain.h"
+#include "string-list.h"
 
 static const char *proc_receive_usage[] = {
        "test-tool proc-receive [<options>]",
@@ -92,9 +92,9 @@ static void proc_receive_read_commands(struct packet_reader *reader,
                if (die_read_commands)
                        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++ != ' ' ||
-                   parse_oid_hex(p, &new_oid, &p) ||
+                   parse_oid_hex_any(p, &new_oid, &p) == GIT_HASH_UNKNOWN ||
                    *p++ != ' ')
                        die("protocol error: expected 'old new ref', got '%s'",
                            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 nongit_ok = 0;
        struct packet_reader reader;
        struct command *commands = NULL;
        struct string_list push_options = STRING_LIST_INIT_DUP;
@@ -154,8 +153,6 @@ int cmd__proc_receive(int argc, const char **argv)
                OPT_END()
        };
 
-       setup_git_directory_gently(&nongit_ok);
-
        argc = parse_options(argc, argv, "test-tools", options, proc_receive_usage, 0);
        if (argc > 0)
                usage_msg_opt("Too many arguments.", proc_receive_usage, options);