test-*-cache-tree: setup git dir

peff · gitster · commit 4ce742fc9c09 · 2016-10-26T13:30:51.000-07:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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");

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ int cmd_main(int ac, const char **av)`
`58`	`58`	`{`
`59`	`59`	`struct index_state istate;`
`60`	`60`	`struct cache_tree *another = cache_tree();`
	`61`	`+ setup_git_directory();`
`61`	`62`	`if (read_cache() < 0)`
`62`	`63`	`die("unable to read index file");`
`63`	`64`	`istate = the_index;`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ static struct lock_file index_lock;`
`7`	`7`
`8`	`8`	`int cmd_main(int ac, const char **av)`
`9`	`9`	`{`
	`10`	`+ setup_git_directory();`
`10`	`11`	`hold_locked_index(&index_lock, 1);`
`11`	`12`	`if (read_cache() < 0)`
`12`	`13`	`die("unable to read index file");`