undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make fsck and fsck-objects be builtins.

Browse Source 
The earlier change df391b192 to rename fsck-objects to fsck broke
fsck-objects.  This should fix it again.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Mark Wooding 2007-01-29 15:48:06 +00:00 committed by Junio C Hamano
parent dbaa06a2b0
commit b4dfefe00f
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -284,6 +284,7 @@ BUILTIN_OBJS = \
builtin-diff-tree.o \ builtin-diff-tree.o \
builtin-fmt-merge-msg.o \ builtin-fmt-merge-msg.o \
builtin-for-each-ref.o \ builtin-for-each-ref.o \
builtin-fsck.o \
builtin-grep.o \ builtin-grep.o \
builtin-init-db.o \ builtin-init-db.o \
builtin-log.o \ builtin-log.o \

3
fsck.c → builtin-fsck.c
View File

@ -571,12 +571,11 @@ static int fsck_cache_tree(struct cache_tree *it)
return err; return err;
} }
int main(int argc, char **argv) int cmd_fsck(int argc, char **argv, const char *prefix)
{ {
int i, heads; int i, heads;
track_object_refs = 1; track_object_refs = 1;
setup_git_directory();
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
const char *arg = argv[i]; const char *arg = argv[i];

1
builtin.h
View File

@ -34,6 +34,7 @@ extern int cmd_diff_tree(int argc, const char **argv, const char *prefix);
extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix); extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
extern int cmd_for_each_ref(int argc, const char **argv, const char *prefix); extern int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
extern int cmd_format_patch(int argc, const char **argv, const char *prefix); extern int cmd_format_patch(int argc, const char **argv, const char *prefix);
extern int cmd_fsck(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_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_grep(int argc, const char **argv, const char *prefix);
extern int cmd_help(int argc, const char **argv, const char *prefix); extern int cmd_help(int argc, const char **argv, const char *prefix);

2
git.c
View File

@ -235,6 +235,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP }, { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
{ "for-each-ref", cmd_for_each_ref, RUN_SETUP }, { "for-each-ref", cmd_for_each_ref, RUN_SETUP },
{ "format-patch", cmd_format_patch, RUN_SETUP }, { "format-patch", cmd_format_patch, RUN_SETUP },
{ "fsck", cmd_fsck, RUN_SETUP },
{ "fsck-objects", cmd_fsck, RUN_SETUP },
{ "get-tar-commit-id", cmd_get_tar_commit_id }, { "get-tar-commit-id", cmd_get_tar_commit_id },
{ "grep", cmd_grep, RUN_SETUP }, { "grep", cmd_grep, RUN_SETUP },
{ "help", cmd_help }, { "help", cmd_help },