Builtin git-ls-files.

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 5423b7a79ba74ce546467d1b5538d8b5dee37b19..c540d7d9f14a3d45a0b4672166ef977f9fa9ecec 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-files$X git-ls-tree$X git-mailinfo$X git-merge-base$X \
+       git-ls-tree$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-init-db$X git-ls-files$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-init-db.o builtin-ls-files.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz

diff --git a/ls-files.c b/builtin-ls-files.c
similarity index 99%
rename from ls-files.c
rename to builtin-ls-files.c
index 4a4af1ca3b3cc11e2996c2889cb8ea16bbb0dded..3a0c5f215003bda5cfa2109953cd556765f6ea2c 100644 (file)
--- a/ls-files.c
+++ b/builtin-ls-files.c
@@ -10,6 +10,7 @@
 
 #include "cache.h"
 #include "quote.h"
+#include "builtin.h"
 
 static int abbrev = 0;
 static int show_deleted = 0;
@@ -648,7 +649,7 @@ static const char ls_files_usage[] =
        "[ --exclude-per-directory=<filename> ] [--full-name] [--abbrev] "
        "[--] [<file>]*";
 
-int main(int argc, const char **argv)
+int cmd_ls_files(int argc, const char **argv, char** envp)
 {
        int i;
        int exc_given = 0;

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

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