Builtin git-cat-file

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 7e6517f62bfbb2f8846fe7b2a1a1bf522db3b4f5..dbf19c62775e1a129575fce5281b1a00fb71cdbc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,6 @@ SIMPLE_PROGRAMS = \
 
 # ... and all the rest that could be moved out of bindir to gitexecdir
 PROGRAMS = \
-       git-cat-file$X \
        git-checkout-index$X git-clone-pack$X \
        git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
        git-hash-object$X git-index-pack$X git-local-fetch$X \
@@ -174,7 +173,7 @@ BUILT_INS = git-log$X git-whatchanged$X git-show$X \
        git-ls-files$X git-ls-tree$X \
        git-read-tree$X git-commit-tree$X \
        git-apply$X git-show-branch$X git-diff-files$X \
-       git-diff-index$X git-diff-stages$X git-diff-tree$X
+       git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X
 
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -228,7 +227,8 @@ BUILTIN_OBJS = \
        builtin-ls-files.o builtin-ls-tree.o \
        builtin-read-tree.o builtin-commit-tree.o \
        builtin-apply.o builtin-show-branch.o builtin-diff-files.o \
-       builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o
+       builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o \
+       builtin-cat-file.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz

diff --git a/cat-file.c b/builtin-cat-file.c
similarity index 97%
rename from cat-file.c
rename to builtin-cat-file.c
index 7413feed78f20feb635ad55f098c59a2afc2a54c..8ab136e981d4ba0ed43c6bd9a907c43fd12b8fcd 100644 (file)
--- a/cat-file.c
+++ b/builtin-cat-file.c
@@ -7,6 +7,7 @@
 #include "exec_cmd.h"
 #include "tag.h"
 #include "tree.h"
+#include "builtin.h"
 
 static void flush_buffer(const char *buf, unsigned long size)
 {
@@ -93,7 +94,7 @@ static int pprint_tag(const unsigned char *sha1, const char *buf, unsigned long
        return 0;
 }
 
-int main(int argc, char **argv)
+int cmd_cat_file(int argc, const char **argv, char **envp)
 {
        unsigned char sha1[20];
        char type[20];

diff --git a/builtin.h b/builtin.h
index 714b97578cb62db7be247c4e799fcd9a946cc76c..738ec3d9453886b1b011b5e01e9ac71b25d8f06f 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -42,5 +42,6 @@ extern int cmd_diff_files(int argc, const char **argv, char **envp);
 extern int cmd_diff_index(int argc, const char **argv, char **envp);
 extern int cmd_diff_stages(int argc, const char **argv, char **envp);
 extern int cmd_diff_tree(int argc, const char **argv, char **envp);
+extern int cmd_cat_file(int argc, const char **argv, char **envp);
 
 #endif

diff --git a/git.c b/git.c
index 5a884bb07a2bf41691f6e568c6877faab17961e7..10ea934bcf3271797e7087e909978d1b4d3a0ea5 100644 (file)
--- a/git.c
+++ b/git.c
@@ -68,7 +68,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "diff-files", cmd_diff_files },
                { "diff-index", cmd_diff_index },
                { "diff-stages", cmd_diff_stages },
-               { "diff-tree", cmd_diff_tree }
+               { "diff-tree", cmd_diff_tree },
+               { "cat-file", cmd_cat_file }
        };
        int i;