Builtin git-read-tree.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index a3164f8ef0444173ff16bcd951200664634aff0b..1aebcf59783aefc6ad92403b353133ed12206275 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -157,7 +157,7 @@ PROGRAMS = \
        git-hash-object$X git-index-pack$X git-local-fetch$X \
        git-mailinfo$X git-merge-base$X \
        git-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \
-       git-peek-remote$X git-prune-packed$X git-read-tree$X \
+       git-peek-remote$X git-prune-packed$X \
        git-receive-pack$X git-rev-parse$X \
        git-send-pack$X git-show-branch$X git-shell$X \
        git-show-index$X git-ssh-fetch$X \
@@ -172,7 +172,7 @@ BUILT_INS = git-log$X git-whatchanged$X git-show$X \
        git-count-objects$X git-diff$X git-push$X \
        git-grep$X git-rev-list$X git-check-ref-format$X \
        git-init-db$X git-ls-files$X git-ls-tree$X \
-       git-tar-tree$X
+       git-tar-tree$X git-read-tree$X
 
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -222,7 +222,7 @@ BUILTIN_OBJS = \
        builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
        builtin-grep.o builtin-rev-list.o builtin-check-ref-format.o \
        builtin-init-db.o builtin-ls-files.o builtin-ls-tree.o \
-        builtin-tar-tree.o
+        builtin-tar-tree.o builtin-read-tree.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz

diff --git a/read-tree.c b/builtin-read-tree.c
similarity index 99%
rename from read-tree.c
rename to builtin-read-tree.c
index 82e2a9a4d3663fad513f607e25fe84a8ccbf5460..ec40d013c4d8508bfd10d75e2dab3090dea64a45 100644 (file)
--- a/read-tree.c
+++ b/builtin-read-tree.c
@@ -11,6 +11,7 @@
 #include "tree.h"
 #include <sys/time.h>
 #include <signal.h>
+#include "builtin.h"
 
 static int reset = 0;
 static int merge = 0;
@@ -763,7 +764,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];

diff --git a/builtin.h b/builtin.h
index d2105439482d51c166352e48c08bca21ee1a5490..88b3523c25a30c15b93f51ec84265a0441994547 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -30,5 +30,6 @@ extern int cmd_init_db(int argc, const char **argv, char **envp);
 extern int cmd_ls_files(int argc, const char **argv, char **envp);
 extern int cmd_ls_tree(int argc, const char **argv, char **envp);
 extern int cmd_tar_tree(int argc, const char **argv, char **envp);
+extern int cmd_read_tree(int argc, const char **argv, char **envp);
 
 #endif

diff --git a/git.c b/git.c
index c253e609532cbf115bf06ed53aec0d138650f001..300e2b269cb7fa823e211e76605c04b5aaa8375d 100644 (file)
--- a/git.c
+++ b/git.c
@@ -55,7 +55,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "check-ref-format", cmd_check_ref_format },
                { "ls-files", cmd_ls_files },
                { "ls-tree", cmd_ls_tree },
-               { "tar-tree", cmd_tar_tree }
+               { "tar-tree", cmd_tar_tree },
+               { "read-tree", cmd_read_tree }
        };
        int i;