The "oidtree" test helper sets up a Git repository, but this is really
only used such that `get_oid_hex()` can parse both SHA1 and SHA256
object hashes. The `struct oidtree` interface itself does not care at
all about the object hash of `the_repository`, and always asserts that
inserted object IDs have their hash algorithm set.
Stop initializing the repository and instead use `get_oid_hex_any()` to
parse object IDs for the "contains" action, like we already do when
parsing the "insert" action.
Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
---
t/helper/test-oidtree.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/t/helper/test-oidtree.c b/t/helper/test-oidtree.c
index c7a1d4c642..04ec24cc84 100644
--- a/t/helper/test-oidtree.c
+++ b/t/helper/test-oidtree.c
@@ -1,7 +1,6 @@
#include "test-tool.h"
#include "hex.h"
#include "oidtree.h"
-#include "setup.h"
#include "strbuf.h"
static enum cb_next print_oid(const struct object_id *oid, void *data UNUSED)
@@ -14,11 +13,9 @@ int cmd__oidtree(int argc UNUSED, const char **argv UNUSED)
{
struct oidtree ot;
struct strbuf line = STRBUF_INIT;
- int nongit_ok;
int algo = GIT_HASH_UNKNOWN;
oidtree_init(&ot);
- setup_git_directory_gently(&nongit_ok);
while (strbuf_getline(&line, stdin) != EOF) {
const char *arg;
@@ -30,7 +27,7 @@ int cmd__oidtree(int argc UNUSED, const char **argv UNUSED)
algo = oid.algo;
oidtree_insert(&ot, &oid);
} else if (skip_prefix(line.buf, "contains ", &arg)) {
- if (get_oid_hex(arg, &oid))
+ if (get_oid_hex_any(arg, &oid) == GIT_HASH_UNKNOWN)
die("contains not a hexadecimal oid: %s", arg);
printf("%d\n", oidtree_contains(&ot, &oid));
} else if (skip_prefix(line.buf, "each ", &arg)) {
--
2.45.2.436.gcd77e87115.dirty
Attachment:
signature.asc
Description: PGP signature
