Builtin git-apply.

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 a1bee61e5738fb6903108e446c3d76a272fee07d..3da576838fcf3606714e64cb4d81ec7bc39dad36 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,7 @@ SIMPLE_PROGRAMS = \
 
 # ... and all the rest that could be moved out of bindir to gitexecdir
 PROGRAMS = \
-       git-apply$X git-cat-file$X \
+       git-cat-file$X \
        git-checkout-index$X git-clone-pack$X \
        git-convert-objects$X git-diff-files$X \
        git-diff-index$X git-diff-stages$X \
@@ -172,7 +172,8 @@ 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-read-tree$X git-commit-tree$X
+       git-tar-tree$X git-read-tree$X git-commit-tree$X \
+       git-apply$X
 
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -222,7 +223,8 @@ 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-read-tree.o builtin-commit-tree.o
+        builtin-tar-tree.o builtin-read-tree.o builtin-commit-tree.o \
+       builtin-apply.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz

diff --git a/apply.c b/builtin-apply.c
similarity index 99%
rename from apply.c
rename to builtin-apply.c
index 0ed9d132e88f52c678a4a64caf3b49d5bc04ee2e..4056b9d67bc1c4e50563ceaa0ee68e94873a8e65 100644 (file)
--- a/apply.c
+++ b/builtin-apply.c
@@ -11,6 +11,7 @@
 #include "quote.h"
 #include "blob.h"
 #include "delta.h"
+#include "builtin.h"
 
 //  --check turns on checking that the working tree matches the
 //    files that are being modified, but doesn't apply the patch
@@ -2151,7 +2152,7 @@ static int git_apply_config(const char *var, const char *value)
 }
 
 
-int main(int argc, char **argv)
+int cmd_apply(int argc, const char **argv, char **envp)
 {
        int i;
        int read_stdin = 1;

diff --git a/builtin.h b/builtin.h
index c6b07d9a658418e833242aa5f0ac798d65d16ede..d6ff88ebc1994f2fd538e6a1abc6cb7279f041c8 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -32,5 +32,6 @@ 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);
 extern int cmd_commit_tree(int argc, const char **argv, char **envp);
+extern int cmd_apply(int argc, const char **argv, char **envp);
 
 #endif

diff --git a/git.c b/git.c
index 4c2c062e3648e4079038bff04fb98776d524af4f..f44e08b9cee77e2e8921c98d84e3e91e3a45bb8d 100644 (file)
--- a/git.c
+++ b/git.c
@@ -57,7 +57,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "ls-tree", cmd_ls_tree },
                { "tar-tree", cmd_tar_tree },
                { "read-tree", cmd_read_tree },
-               { "commit-tree", cmd_commit_tree }
+               { "commit-tree", cmd_commit_tree },
+               { "apply", cmd_apply }
        };
        int i;