From 669c95526b6edf8e73c57ced416ff0502d830bb8 Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Wed, 29 Sep 2021 15:15:37 -0400 Subject: [PATCH] fixup! fsmonitor--daemon: add a built-in fsmonitor daemon This reverts commit b441b3720edaeae8b23e3e29df06557278257c2f. Signed-off-by: Jeff Hostetler --- .gitignore | 1 - Makefile | 1 - builtin.h | 1 - builtin/fsmonitor--daemon.c | 53 ------------------------------------- git.c | 1 - 5 files changed, 57 deletions(-) delete mode 100644 builtin/fsmonitor--daemon.c diff --git a/.gitignore b/.gitignore index 4baba472aa..311841f9be 100644 --- a/.gitignore +++ b/.gitignore @@ -72,7 +72,6 @@ /git-format-patch /git-fsck /git-fsck-objects -/git-fsmonitor--daemon /git-gc /git-get-tar-commit-id /git-grep diff --git a/Makefile b/Makefile index f62752c1cc..e595e9539d 100644 --- a/Makefile +++ b/Makefile @@ -1109,7 +1109,6 @@ BUILTIN_OBJS += builtin/fmt-merge-msg.o BUILTIN_OBJS += builtin/for-each-ref.o BUILTIN_OBJS += builtin/for-each-repo.o BUILTIN_OBJS += builtin/fsck.o -BUILTIN_OBJS += builtin/fsmonitor--daemon.o BUILTIN_OBJS += builtin/gc.o BUILTIN_OBJS += builtin/get-tar-commit-id.o BUILTIN_OBJS += builtin/grep.o diff --git a/builtin.h b/builtin.h index 2470d1cd3a..16ecd5586f 100644 --- a/builtin.h +++ b/builtin.h @@ -159,7 +159,6 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix); int cmd_for_each_repo(int argc, const char **argv, const char *prefix); int cmd_format_patch(int argc, const char **argv, const char *prefix); int cmd_fsck(int argc, const char **argv, const char *prefix); -int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix); int cmd_gc(int argc, const char **argv, const char *prefix); int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix); int cmd_grep(int argc, const char **argv, const char *prefix); diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c deleted file mode 100644 index df2bad5311..0000000000 --- a/builtin/fsmonitor--daemon.c +++ /dev/null @@ -1,53 +0,0 @@ -#include "builtin.h" -#include "config.h" -#include "parse-options.h" -#include "fsmonitor.h" -#include "fsmonitor-ipc.h" -#include "simple-ipc.h" -#include "khash.h" - -static const char * const builtin_fsmonitor__daemon_usage[] = { - NULL -}; - -#ifdef HAVE_FSMONITOR_DAEMON_BACKEND - -int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix) -{ - const char *subcmd; - - struct option options[] = { - OPT_END() - }; - - if (argc < 2) - usage_with_options(builtin_fsmonitor__daemon_usage, options); - - if (argc == 2 && !strcmp(argv[1], "-h")) - usage_with_options(builtin_fsmonitor__daemon_usage, options); - - git_config(git_default_config, NULL); - - subcmd = argv[1]; - argv--; - argc++; - - argc = parse_options(argc, argv, prefix, options, - builtin_fsmonitor__daemon_usage, 0); - - die(_("Unhandled subcommand '%s'"), subcmd); -} - -#else -int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix) -{ - struct option options[] = { - OPT_END() - }; - - if (argc == 2 && !strcmp(argv[1], "-h")) - usage_with_options(builtin_fsmonitor__daemon_usage, options); - - die(_("fsmonitor--daemon not supported on this platform")); -} -#endif diff --git a/git.c b/git.c index c6160f4a88..18bed9a996 100644 --- a/git.c +++ b/git.c @@ -533,7 +533,6 @@ static struct cmd_struct commands[] = { { "format-patch", cmd_format_patch, RUN_SETUP }, { "fsck", cmd_fsck, RUN_SETUP }, { "fsck-objects", cmd_fsck, RUN_SETUP }, - { "fsmonitor--daemon", cmd_fsmonitor__daemon, RUN_SETUP }, { "gc", cmd_gc, RUN_SETUP }, { "get-tar-commit-id", cmd_get_tar_commit_id, NO_PARSEOPT }, { "grep", cmd_grep, RUN_SETUP_GENTLY },