Make git-pack-objects a builtin
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
Matthias Kestenholz committed
Aug 3, 2006 at 17:24 UTC
5d4a60033543e063bc9d77ca957de0187fb58fb3
4 files changed
+7
-5
Makefile
+3
-3
@@ -177,7 +177,7 @@ PROGRAMS = \
177
git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
178
git-hash-object$X git-index-pack$X git-local-fetch$X \
179
git-merge-base$X \
180
- git-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \
180
+ git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
181
git-peek-remote$X git-receive-pack$X \
182
git-send-pack$X git-shell$X \
183
git-show-index$X git-ssh-fetch$X \
@@ -198,7 +198,7 @@ BUILT_INS = git-log$X git-whatchanged$X git-show$X git-update-ref$X \
198
git-apply$X git-show-branch$X git-diff-files$X git-update-index$X \
199
git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
200
git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X \
201
- git-repo-config$X git-name-rev$X
201
+ git-repo-config$X git-name-rev$X git-pack-objects$X
202
203
# what 'all' will build and 'install' will install, in gitexecdir
204
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -256,7 +256,7 @@ BUILTIN_OBJS = \
256
builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
257
builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \
258
builtin-mv.o builtin-prune-packed.o builtin-repo-config.o \
259
- builtin-name-rev.o
259
+ builtin-name-rev.o builtin-pack-objects.o
260
261
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
262
LIBS = $(GITLIBS) -lz
builtin-pack-objects.c
renamed
+2
-2
@@ -1,3 +1,4 @@
1
+#include "builtin.h"
2
#include "cache.h"
3
#include "object.h"
4
#include "blob.h"
@@ -1226,7 +1227,7 @@ static int git_pack_config(const char *k, const char *v)
1227
return git_default_config(k, v);
1228
}
1229
1229
-int main(int argc, char **argv)
1230
+int cmd_pack_objects(int argc, const char **argv, const char *prefix)
1231
{
1232
SHA_CTX ctx;
1233
char line[40 + 1 + PATH_MAX + 2];
@@ -1235,7 +1236,6 @@ int main(int argc, char **argv)
1236
int num_preferred_base = 0;
1237
int i;
1238
1238
- setup_git_directory();
1239
git_config(git_pack_config);
1240
1241
progress = isatty(2);
builtin.h
+1
@@ -50,6 +50,7 @@ extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
50
extern int cmd_mv(int argc, const char **argv, const char *prefix);
51
extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
52
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
53
+extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
54
55
extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
56
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
git.c
+1
@@ -266,6 +266,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
266
{ "prune-packed", cmd_prune_packed, NEEDS_PREFIX },
267
{ "repo-config", cmd_repo_config },
268
{ "name-rev", cmd_name_rev, NEEDS_PREFIX },
269
+ { "pack-objects", cmd_pack_objects, NEEDS_PREFIX },
270
};
271
int i;
272