Builtin git-ls-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 c540d7d9f14a3d45a0b4672166ef977f9fa9ecec..2afd089a0d86d1e74c19ce6615fe9c6ff2a39092 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -155,7 +155,7 @@ PROGRAMS = \
        git-diff-index$X git-diff-stages$X \
        git-diff-tree$X git-fetch-pack$X git-fsck-objects$X \
        git-hash-object$X git-index-pack$X git-local-fetch$X \
-       git-ls-tree$X git-mailinfo$X git-merge-base$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-receive-pack$X git-rev-parse$X \
@@ -171,7 +171,7 @@ PROGRAMS = \
 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-init-db$X git-ls-files$X git-ls-tree$X
 
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -220,7 +220,7 @@ LIB_OBJS = \
 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-init-db.o builtin-ls-files.o builtin-ls-tree.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz

diff --git a/ls-tree.c b/builtin-ls-tree.c
similarity index 96%
rename from ls-tree.c
rename to builtin-ls-tree.c
index f2b3bc1231b7fdfd7277974fc5a5708ceef9cbaf..48385d59f6097258b83ebbf0156e1913043b6928 100644 (file)
--- a/ls-tree.c
+++ b/builtin-ls-tree.c
@@ -7,6 +7,7 @@
 #include "blob.h"
 #include "tree.h"
 #include "quote.h"
+#include "builtin.h"
 
 static int line_termination = '\n';
 #define LS_RECURSIVE 1
@@ -15,7 +16,7 @@ static int line_termination = '\n';
 #define LS_NAME_ONLY 8
 static int abbrev = 0;
 static int ls_options = 0;
-const char **pathspec;
+static const char **pathspec;
 static int chomp_prefix = 0;
 static const char *prefix;
 
@@ -84,7 +85,7 @@ static int show_tree(unsigned char *sha1, const char *base, int baselen,
        return retval;
 }
 
-int main(int argc, const char **argv)
+int cmd_ls_tree(int argc, const char **argv, char **envp)
 {
        unsigned char sha1[20];
        struct tree *tree;

diff --git a/builtin.h b/builtin.h
index a0713d37474202fa0e7056452365e0890dc1b313..951f2063722b99c35c2052c1286fcad2f4dba54f 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -28,5 +28,6 @@ extern int cmd_rev_list(int argc, const char **argv, char **envp);
 extern int cmd_check_ref_format(int argc, const char **argv, char **envp);
 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);
 
 #endif

diff --git a/git.c b/git.c
index 9cfa9ebced37b3ff784cae56a6575d4036484093..8574775418954b9875a93dd50e84f108762d9a4e 100644 (file)
--- a/git.c
+++ b/git.c
@@ -53,7 +53,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "rev-list", cmd_rev_list },
                { "init-db", cmd_init_db },
                { "check-ref-format", cmd_check_ref_format },
-               { "ls-files", cmd_ls_files }
+               { "ls-files", cmd_ls_files },
+               { "ls-tree", cmd_ls_tree }
        };
        int i;