summaryrefslogtreecommitdiff
path: root/t/helper
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-10-20 02:16:59 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-26 13:30:51 -0700
commit4ce742fc9c09cd3b95be309bc093f8fa54c15f96 (patch)
tree8e6736889ceefd7243cf864059372c6ee9ef67b6 /t/helper
parentread info/{attributes,exclude} only when in repository (diff)
downloadtgif-4ce742fc9c09cd3b95be309bc093f8fa54c15f96.tar.xz
test-*-cache-tree: setup git dir
These test helper programs access the index, but do not ever setup_git_directory(), meaning we just blindly looked in ".git/index". This happened to work for the purposes of our tests (which do not run from subdirectories, nor in non-repos), but it's a bad habit. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/helper')
-rw-r--r--t/helper/test-dump-cache-tree.c1
-rw-r--r--t/helper/test-scrap-cache-tree.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/t/helper/test-dump-cache-tree.c b/t/helper/test-dump-cache-tree.c
index 44f3290258..7af116d49e 100644
--- a/t/helper/test-dump-cache-tree.c
+++ b/t/helper/test-dump-cache-tree.c
@@ -58,6 +58,7 @@ int cmd_main(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");
istate = the_index;
diff --git a/t/helper/test-scrap-cache-tree.c b/t/helper/test-scrap-cache-tree.c
index 5b2fd09908..27fe0405b8 100644
--- a/t/helper/test-scrap-cache-tree.c
+++ b/t/helper/test-scrap-cache-tree.c
@@ -7,6 +7,7 @@ static struct lock_file index_lock;
int cmd_main(int ac, const char **av)
{
+ setup_git_directory();
hold_locked_index(&index_lock, 1);
if (read_cache() < 0)
die("unable to read index file");