From: Eric DeCosta <edecosta@xxxxxxxxxxxxx>
If fsmonitor is not in a compatible state, die with an appropriate error
messge.
Signed-off-by: Eric DeCosta <edecosta@xxxxxxxxxxxxx>
---
fsmonitor-settings.c | 2 ++
fsmonitor.c | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c
index 531a1b6f956..aaa204e0352 100644
--- a/fsmonitor-settings.c
+++ b/fsmonitor-settings.c
@@ -247,6 +247,8 @@ char *fsm_settings__get_incompatible_msg(const struct repository *r,
{
struct strbuf msg = STRBUF_INIT;
+ strbuf_add(&msg, "fsmonitor: ", strlen("fsmonitor: "));
+
switch (reason) {
case FSMONITOR_REASON_UNTESTED:
case FSMONITOR_REASON_OK:
diff --git a/fsmonitor.c b/fsmonitor.c
index 57d6a483bee..43d580132fb 100644
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -305,6 +305,10 @@ void refresh_fsmonitor(struct index_state *istate)
int is_trivial = 0;
struct repository *r = istate->repo ? istate->repo : the_repository;
enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
+ enum fsmonitor_reason reason = fsm_settings__get_reason(r);
+
+ if (reason > FSMONITOR_REASON_OK)
+ die("%s", fsm_settings__get_incompatible_msg(r, reason));
if (fsm_mode <= FSMONITOR_MODE_DISABLED ||
istate->fsmonitor_has_run_once)
--
gitgitgadget
