Merge branch 'js/rebase-i-root-fix'

diff --git a/t/helper/test-scrap-cache-tree.c b/t/helper/test-scrap-cache-tree.c
index 34596201d4af7b956494bfe3fda2a95d67471fba..393f1604ff954703a2a5e075fbda1e14d0827dc0 100644 (file)
--- a/t/helper/test-scrap-cache-tree.c
+++ b/t/helper/test-scrap-cache-tree.c
@@ -1,9 +1,10 @@
+#include "test-tool.h"
 #include "cache.h"
 #include "lockfile.h"
 #include "tree.h"
 #include "cache-tree.h"
 
-int cmd_main(int ac, const char **av)
+int cmd__scrap_cache_tree(int ac, const char **av)
 {
        struct lock_file index_lock = LOCK_INIT;