Merge branch 'jc/cache-tree'
[git/git.git] / builtin-read-tree.c
similarity index 99%
rename from read-tree.c
rename to builtin-read-tree.c
index 99e7c75..716f792 100644 (file)
@@ -12,6 +12,7 @@
 #include "cache-tree.h"
 #include <sys/time.h>
 #include <signal.h>
+#include "builtin.h"
 
 static int reset = 0;
 static int merge = 0;
@@ -808,7 +809,7 @@ static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive]
 
 static struct cache_file cache_file;
 
-int main(int argc, char **argv)
+int cmd_read_tree(int argc, const char **argv, char **envp)
 {
        int i, newfd, stage = 0;
        unsigned char sha1[20];