diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 19:50:11 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-21 20:07:06 -0800 |
| commit | b28a1ce04cdafbd3b470ec43c0f562054bd45d4d (patch) | |
| tree | 36a4a3499ed6d6350c6ac35581ba697759218dd2 | |
| parent | make "git merge-tree" a built-in (diff) | |
| download | tgif-b28a1ce04cdafbd3b470ec43c0f562054bd45d4d.tar.xz | |
make "git hash-object" a built-in
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | builtin-hash-object.c (renamed from hash-object.c) | 5 | ||||
| -rw-r--r-- | builtin.h | 1 | ||||
| -rw-r--r-- | git.c | 1 |
4 files changed, 4 insertions, 5 deletions
@@ -387,7 +387,6 @@ EXTRA_PROGRAMS = # ... and all the rest that could be moved out of bindir to gitexecdir PROGRAMS += $(EXTRA_PROGRAMS) PROGRAMS += git-fast-import$X -PROGRAMS += git-hash-object$X PROGRAMS += git-imap-send$X PROGRAMS += git-index-pack$X PROGRAMS += git-merge-index$X @@ -658,6 +657,7 @@ BUILTIN_OBJS += builtin-for-each-ref.o BUILTIN_OBJS += builtin-fsck.o BUILTIN_OBJS += builtin-gc.o BUILTIN_OBJS += builtin-grep.o +BUILTIN_OBJS += builtin-hash-object.o BUILTIN_OBJS += builtin-help.o BUILTIN_OBJS += builtin-init-db.o BUILTIN_OBJS += builtin-log.o diff --git a/hash-object.c b/builtin-hash-object.c index 9455dd0709..6a5f5b5f0e 100644 --- a/hash-object.c +++ b/builtin-hash-object.c @@ -73,17 +73,14 @@ static const struct option hash_object_options[] = { OPT_END() }; -int main(int argc, const char **argv) +int cmd_hash_object(int argc, const char **argv, const char *prefix) { int i; - const char *prefix = NULL; int prefix_length = -1; const char *errstr = NULL; type = blob_type; - git_extract_argv0_path(argv[0]); - argc = parse_options(argc, argv, NULL, hash_object_options, hash_object_usage, 0); @@ -55,6 +55,7 @@ extern int cmd_fsck(int argc, const char **argv, const char *prefix); extern int cmd_gc(int argc, const char **argv, const char *prefix); extern int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix); extern int cmd_grep(int argc, const char **argv, const char *prefix); +extern int cmd_hash_object(int argc, const char **argv, const char *prefix); extern int cmd_help(int argc, const char **argv, const char *prefix); extern int cmd_http_fetch(int argc, const char **argv, const char *prefix); extern int cmd_init_db(int argc, const char **argv, const char *prefix); @@ -318,6 +318,7 @@ static void handle_internal_command(int argc, const char **argv) { "gc", cmd_gc, RUN_SETUP }, { "get-tar-commit-id", cmd_get_tar_commit_id }, { "grep", cmd_grep, USE_PAGER }, + { "hash-object", cmd_hash_object }, { "help", cmd_help }, { "init", cmd_init_db }, { "init-db", cmd_init_db }, |