Make fsck and fsck-objects be builtins.
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>
Mark Wooding committed
Jan 29, 2007 at 15:48 UTC
b4dfefe00f7035140b7a10e855a665c1347cacd6
4 files changed
+5
-2
Makefile
+1
@@ -284,6 +284,7 @@ BUILTIN_OBJS = \
284
builtin-diff-tree.o \
285
builtin-fmt-merge-msg.o \
286
builtin-for-each-ref.o \
287
+ builtin-fsck.o \
288
builtin-grep.o \
289
builtin-init-db.o \
290
builtin-log.o \
builtin-fsck.c
renamed
+1
-2
@@ -571,12 +571,11 @@ static int fsck_cache_tree(struct cache_tree *it)
571
return err;
572
}
573
574
-int main(int argc, char **argv)
574
+int cmd_fsck(int argc, char **argv, const char *prefix)
575
{
576
int i, heads;
577
578
track_object_refs = 1;
579
- setup_git_directory();
579
580
for (i = 1; i < argc; i++) {
581
const char *arg = argv[i];
builtin.h
+1
@@ -34,6 +34,7 @@ extern int cmd_diff_tree(int argc, const char **argv, const char *prefix);
34
extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
35
extern int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
36
extern int cmd_format_patch(int argc, const char **argv, const char *prefix);
37
+extern int cmd_fsck(int argc, const char **argv, const char *prefix);
38
extern int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix);
39
extern int cmd_grep(int argc, const char **argv, const char *prefix);
40
extern int cmd_help(int argc, const char **argv, const char *prefix);
git.c
+2
@@ -235,6 +235,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
235
{ "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
236
{ "for-each-ref", cmd_for_each_ref, RUN_SETUP },
237
{ "format-patch", cmd_format_patch, RUN_SETUP },
238
+ { "fsck", cmd_fsck, RUN_SETUP },
239
+ { "fsck-objects", cmd_fsck, RUN_SETUP },
240
{ "get-tar-commit-id", cmd_get_tar_commit_id },
241
{ "grep", cmd_grep, RUN_SETUP },
242
{ "help", cmd_help },