b5a8169752
Without this bug fix, t7519's four "status doesn't detect unreported modifications" test cases would fail occasionally (and, oddly enough, *a lot* more frequently on Windows). The reason is that these test cases intentionally use the side effect of `git status` to re-write the index if any updates were detected: they first clean the worktree, run `git status` to update the index as well as show the output to the casual reader, then make the worktree dirty again and expect no changes to reported if running with a mocked fsmonitor hook. The problem with this strategy was that the index was written during said `git status` on the clean worktree for the *wrong* reason: not because the index was marked as changed (it wasn't), but because the recorded mtimes were racy with the index' own mtime. As the mtime granularity on Windows is 100 nanoseconds (see e.g. https://docs.microsoft.com/en-us/windows/desktop/SysInfo/file-times), the mtimes of the files are often enough *not* racy with the index', so that that `git status` call currently does not always update the index (including the fsmonitor extension), causing the test case to fail. The obvious fix: if we change *any* index entry's `CE_FSMONITOR_VALID` flag, we should also mark the index as changed. That will cause the index to be written upon `git status`, *including* an updated fsmonitor extension. Side note: Even though the reader might think that the t7519 issue should be *much* more prevalent on Linux, given that the ext4 filesystem (that seems to be used by every Linux distribution) stores mtimes in nanosecond precision. However, ext4 uses `current_kernel_time()` (see https://unix.stackexchange.com/questions/11599#comment762968_11599; it is *amazingly* hard to find any proper source of information about such ext4 questions) whose accuracy seems to depend on many factors but is safely worse than the 100-nanosecond granularity of NTFS (again, it is *horribly* hard to find anything remotely authoritative about this question). So it seems that the racy index condition that hid the bug fixed by this patch simply is a lot more likely on Linux than on Windows. But not impossible ;-) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
78 lines
2.4 KiB
C
78 lines
2.4 KiB
C
#ifndef FSMONITOR_H
|
|
#define FSMONITOR_H
|
|
|
|
#include "cache.h"
|
|
#include "dir.h"
|
|
|
|
extern struct trace_key trace_fsmonitor;
|
|
|
|
/*
|
|
* Read the fsmonitor index extension and (if configured) restore the
|
|
* CE_FSMONITOR_VALID state.
|
|
*/
|
|
int read_fsmonitor_extension(struct index_state *istate, const void *data, unsigned long sz);
|
|
|
|
/*
|
|
* Fill the fsmonitor_dirty ewah bits with their state from the index,
|
|
* before it is split during writing.
|
|
*/
|
|
void fill_fsmonitor_bitmap(struct index_state *istate);
|
|
|
|
/*
|
|
* Write the CE_FSMONITOR_VALID state into the fsmonitor index
|
|
* extension. Reads from the fsmonitor_dirty ewah in the index.
|
|
*/
|
|
void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate);
|
|
|
|
/*
|
|
* Add/remove the fsmonitor index extension
|
|
*/
|
|
void add_fsmonitor(struct index_state *istate);
|
|
void remove_fsmonitor(struct index_state *istate);
|
|
|
|
/*
|
|
* Add/remove the fsmonitor index extension as necessary based on the current
|
|
* core.fsmonitor setting.
|
|
*/
|
|
void tweak_fsmonitor(struct index_state *istate);
|
|
|
|
/*
|
|
* Run the configured fsmonitor integration script and clear the
|
|
* CE_FSMONITOR_VALID bit for any files returned as dirty. Also invalidate
|
|
* any corresponding untracked cache directory structures. Optimized to only
|
|
* run the first time it is called.
|
|
*/
|
|
void refresh_fsmonitor(struct index_state *istate);
|
|
|
|
/*
|
|
* Set the given cache entries CE_FSMONITOR_VALID bit. This should be
|
|
* called any time the cache entry has been updated to reflect the
|
|
* current state of the file on disk.
|
|
*/
|
|
static inline void mark_fsmonitor_valid(struct index_state *istate, struct cache_entry *ce)
|
|
{
|
|
if (core_fsmonitor && !(ce->ce_flags & CE_FSMONITOR_VALID)) {
|
|
istate->cache_changed = 1;
|
|
ce->ce_flags |= CE_FSMONITOR_VALID;
|
|
trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_clean '%s'", ce->name);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Clear the given cache entry's CE_FSMONITOR_VALID bit and invalidate
|
|
* any corresponding untracked cache directory structures. This should
|
|
* be called any time git creates or modifies a file that should
|
|
* trigger an lstat() or invalidate the untracked cache for the
|
|
* corresponding directory
|
|
*/
|
|
static inline void mark_fsmonitor_invalid(struct index_state *istate, struct cache_entry *ce)
|
|
{
|
|
if (core_fsmonitor) {
|
|
ce->ce_flags &= ~CE_FSMONITOR_VALID;
|
|
untracked_cache_invalidate_path(istate, ce->name, 1);
|
|
trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_invalid '%s'", ce->name);
|
|
}
|
|
}
|
|
|
|
#endif
|