Make git-unpack-objects a builtin

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 4fd62bcf6dc5a71526fd7d81a6138e8456171a14..b108a8aa7af92206c8aecb5fb9513593089ca601 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@ PROGRAMS = \
        git-send-pack$X git-shell$X \
        git-show-index$X git-ssh-fetch$X \
        git-ssh-upload$X git-unpack-file$X \
-       git-unpack-objects$X git-update-server-info$X \
+       git-update-server-info$X \
        git-upload-pack$X git-verify-pack$X \
        git-symbolic-ref$X \
        git-pack-redundant$X git-var$X \
@@ -198,7 +198,8 @@ BUILT_INS = git-log$X git-whatchanged$X git-show$X git-update-ref$X \
        git-apply$X git-show-branch$X git-diff-files$X git-update-index$X \
        git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
        git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X \
-       git-repo-config$X git-name-rev$X git-pack-objects$X
+       git-repo-config$X git-name-rev$X git-pack-objects$X \
+       git-unpack-objects$X
 
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -256,7 +257,7 @@ BUILTIN_OBJS = \
        builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
        builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \
        builtin-mv.o builtin-prune-packed.o builtin-repo-config.o \
-       builtin-name-rev.o builtin-pack-objects.o
+       builtin-name-rev.o builtin-pack-objects.o builtin-unpack-objects.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz

diff --git a/unpack-objects.c b/builtin-unpack-objects.c
similarity index 98%
rename from unpack-objects.c
rename to builtin-unpack-objects.c
index 48c1ee7968cc6b40cb02cd99d35e66630f922041..09d264d9f2cc19b3bab245bb68c639cec3d1b57c 100644 (file)
--- a/unpack-objects.c
+++ b/builtin-unpack-objects.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
 #include "cache.h"
 #include "object.h"
 #include "delta.h"
@@ -112,7 +113,7 @@ static void write_object(void *buf, unsigned long size, const char *type)
 }
 
 static int resolve_delta(const char *type,
-       void *base, unsigned long base_size, 
+       void *base, unsigned long base_size,
        void *delta, unsigned long delta_size)
 {
        void *result;
@@ -260,13 +261,11 @@ static void unpack_all(void)
                die("unresolved deltas left after unpacking");
 }
 
-int main(int argc, char **argv)
+int cmd_unpack_objects(int argc, const char **argv, const char *prefix)
 {
        int i;
        unsigned char sha1[20];
 
-       setup_git_directory();
-
        quiet = !isatty(2);
 
        for (i = 1 ; i < argc; i++) {

diff --git a/builtin.h b/builtin.h
index bc57a04c053689e470b66bd9b7a3674a7ca0c950..af73c3c19e6b255cd90d69e0b5da9069d3732b91 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -51,6 +51,7 @@ extern int cmd_mv(int argc, const char **argv, const char *prefix);
 extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
 extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
 extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
+extern int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
 
 extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
 extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);

diff --git a/git.c b/git.c
index 5d58946f41684f2df2d98222a2c0bd076a9ada4a..7c3a7f8fd156a75b0912043d53a54d8b169851a0 100644 (file)
--- a/git.c
+++ b/git.c
@@ -267,6 +267,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "repo-config", cmd_repo_config },
                { "name-rev", cmd_name_rev, NEEDS_PREFIX },
                { "pack-objects", cmd_pack_objects, NEEDS_PREFIX },
+               { "unpack-objects", cmd_unpack_objects, NEEDS_PREFIX },
        };
        int i;