git-rebase: error out when incompatible options passed

diff --git a/fsmonitor.c b/fsmonitor.c
index b6fcb0f08fb6d3e34437ba36526d51bae477b0af..665bd2d4254b12edf38e94cb0e8b2200ae3bf34a 100644 (file)
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -179,6 +179,9 @@ void refresh_fsmonitor(struct index_state *istate)
                for (i = 0; i < istate->cache_nr; i++)
                        istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
 
+               /* If we're going to check every file, ensure we save the results */
+               istate->cache_changed |= FSMONITOR_CHANGED;
+
                if (istate->untracked)
                        istate->untracked->use_fsmonitor = 0;
        }