Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/merge-x-theirs-docfix' into maint
[gitweb.git]
/
t
/
helper
/
test-scrap-cache-tree.c
diff --git
a/t/helper/test-scrap-cache-tree.c
b/t/helper/test-scrap-cache-tree.c
index 5b2fd0990894dd59a074ded5822bbcf215a989aa..d2a63bea4346fb76d38ba43508ee6e60599e41a9 100644
(file)
--- a/
t/helper/test-scrap-cache-tree.c
+++ b/
t/helper/test-scrap-cache-tree.c
@@
-7,7
+7,8
@@
static struct lock_file index_lock;
int cmd_main(int ac, const char **av)
{
- hold_locked_index(&index_lock, 1);
+ setup_git_directory();
+ hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
if (read_cache() < 0)
die("unable to read index file");
active_cache_tree = NULL;