Signed-off-by: Stefan Beller <sbel...@google.com>
---
t/helper/test-dump-cache-tree.c | 5 ++---
t/helper/test-dump-untracked-cache.c | 4 ++--
t/helper/test-lazy-init-name-hash.c | 11 ++++++-----
t/helper/test-read-cache.c | 3 ++-
t/helper/test-scrap-cache-tree.c | 4 ++--
t/helper/test-write-cache.c | 3 ++-
6 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/t/helper/test-dump-cache-tree.c b/t/helper/test-dump-cache-tree.c
index 98a4891f1dc..a58c26084dd 100644
--- a/t/helper/test-dump-cache-tree.c
+++ b/t/helper/test-dump-cache-tree.c
@@ -2,7 +2,7 @@
#include "cache.h"
#include "tree.h"
#include "cache-tree.h"
-
+#include "repository.h"
static void dump_one(struct cache_tree *it, const char *pfx, const char *x)
{
@@ -60,8 +60,7 @@ int cmd__dump_cache_tree(int ac, const char **av)
struct index_state istate;
struct cache_tree *another = cache_tree();
setup_git_directory();
- if (read_cache() < 0)
- die("unable to read index file");
+ repo_read_index_or_die(the_repository);
istate = the_index;
istate.cache_tree = another;
cache_tree_update(&istate, WRITE_TREE_DRY_RUN);
diff --git a/t/helper/test-dump-untracked-cache.c
b/t/helper/test-dump-untracked-cache.c
index d7c55c2355e..171ba143c9a 100644
--- a/t/helper/test-dump-untracked-cache.c
+++ b/t/helper/test-dump-untracked-cache.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "dir.h"
+#include "repository.h"
static int compare_untracked(const void *a_, const void *b_)
{
@@ -47,8 +48,7 @@ int cmd_main(int ac, const char **av)
ignore_untracked_cache_config = 1;
setup_git_directory();
- if (read_cache() < 0)
- die("unable to read index file");
+ repo_read_index_or_die(the_repository);
uc = the_index.untracked;
if (!uc) {
printf("no untracked cache\n");
diff --git a/t/helper/test-lazy-init-name-hash.c
b/t/helper/test-lazy-init-name-hash.c
index b99a37080d9..e25bfe27ab9 100644
--- a/t/helper/test-lazy-init-name-hash.c
+++ b/t/helper/test-lazy-init-name-hash.c
@@ -1,6 +1,7 @@
#include "test-tool.h"
#include "cache.h"
#include "parse-options.h"
+#include "repository.h"
static int single;
static int multi;
@@ -32,7 +33,7 @@ static void dump_run(void)
struct dir_entry *dir;
struct cache_entry *ce;
- read_cache();
+ repo_read_index_or_die(the_repository);
if (single) {
test_lazy_init_name_hash(&the_index, 0);
} else {
@@ -70,7 +71,7 @@ static uint64_t time_runs(int try_threaded)
for (i = 0; i < count; i++) {
t0 = getnanotime();
- read_cache();
+ repo_read_index_or_die(the_repository);
t1 = getnanotime();
nr_threads_used = test_lazy_init_name_hash(&the_index,
try_threaded);
t2 = getnanotime();
@@ -117,7 +118,7 @@ static void analyze_run(void)
int i;
int nr;
- read_cache();
+ repo_read_index_or_die(the_repository);
cache_nr_limit = the_index.cache_nr;
discard_cache();
@@ -132,7 +133,7 @@ static void analyze_run(void)
nr = cache_nr_limit;
for (i = 0; i < count; i++) {
- read_cache();
+ repo_read_index_or_die(the_repository);
the_index.cache_nr = nr; /* cheap truncate of index */
t1s = getnanotime();
test_lazy_init_name_hash(&the_index, 0);
@@ -141,7 +142,7 @@ static void analyze_run(void)
the_index.cache_nr = cache_nr_limit;
discard_cache();
- read_cache();
+ repo_read_index_or_die(the_repository);
the_index.cache_nr = nr; /* cheap truncate of index */
t1m = getnanotime();
nr_threads_used = test_lazy_init_name_hash(&the_index,
1);
diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c
index d674c88ba09..7a4a91bf328 100644
--- a/t/helper/test-read-cache.c
+++ b/t/helper/test-read-cache.c
@@ -1,5 +1,6 @@
#include "test-tool.h"
#include "cache.h"
+#include "repository.h"
int cmd__read_cache(int argc, const char **argv)
{
@@ -8,7 +9,7 @@ int cmd__read_cache(int argc, const char **argv)
cnt = strtol(argv[1], NULL, 0);
setup_git_directory();
for (i = 0; i < cnt; i++) {
- read_cache();
+ repo_read_index_or_die(the_repository);
discard_cache();
}
return 0;
diff --git a/t/helper/test-scrap-cache-tree.c b/t/helper/test-scrap-cache-tree.c
index d26d3e7c8b1..401917abb49 100644
--- a/t/helper/test-scrap-cache-tree.c
+++ b/t/helper/test-scrap-cache-tree.c
@@ -3,6 +3,7 @@
#include "lockfile.h"
#include "tree.h"
#include "cache-tree.h"
+#include "repository.h"
static struct lock_file index_lock;
@@ -10,8 +11,7 @@ int cmd__scrap_cache_tree(int ac, const char **av)
{
setup_git_directory();
hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
- if (read_cache() < 0)
- die("unable to read index file");
+ repo_read_index_or_die(the_repository);
active_cache_tree = NULL;
if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
die("unable to write index file");
diff --git a/t/helper/test-write-cache.c b/t/helper/test-write-cache.c
index 017dc303800..6fd750da254 100644
--- a/t/helper/test-write-cache.c
+++ b/t/helper/test-write-cache.c
@@ -1,6 +1,7 @@
#include "test-tool.h"
#include "cache.h"
#include "lockfile.h"
+#include "repository.h"
static struct lock_file index_lock;
@@ -10,7 +11,7 @@ int cmd__write_cache(int argc, const char **argv)
if (argc == 2)
cnt = strtol(argv[1], NULL, 0);
setup_git_directory();
- read_cache();
+ repo_read_index_or_die(the_repository);
for (i = 0; i < cnt; i++) {
lockfd = hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
if (0 <= lockfd) {
--
2.17.0.582.gccdcbd54c44.dirty
