undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsmonitor: force a refresh after the index was discarded

Browse Source 
With this change, the `index_state` struct becomes the new home for the
flag that says whether the fsmonitor hook has been run, i.e. it is now
per-index.

It also gets re-set when the index is discarded, fixing the bug
demonstrated by the "test_expect_failure" test added in the preceding
commit. In that case fsmonitor-enabled Git would miss updates under
certain circumstances, see that preceding commit for details.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2019-05-07 13:10:21 +02:00 committed by Junio C Hamano
parent dc76852df2
commit 398a3b0899
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cache.h
View File

@ -338,7 +338,8 @@ struct index_state {
struct cache_time timestamp; struct cache_time timestamp;
unsigned name_hash_initialized : 1, unsigned name_hash_initialized : 1,
initialized : 1, initialized : 1,
drop_cache_tree : 1; drop_cache_tree : 1,
fsmonitor_has_run_once : 1;
struct hashmap name_hash; struct hashmap name_hash;
struct hashmap dir_hash; struct hashmap dir_hash;
struct object_id oid; struct object_id oid;

5
fsmonitor.c
View File

@ -129,7 +129,6 @@ static void fsmonitor_refresh_callback(struct index_state *istate, const char *n
void refresh_fsmonitor(struct index_state *istate) void refresh_fsmonitor(struct index_state *istate)
{ {
static int has_run_once = 0;
struct strbuf query_result = STRBUF_INIT; struct strbuf query_result = STRBUF_INIT;
int query_success = 0; int query_success = 0;
size_t bol; /* beginning of line */ size_t bol; /* beginning of line */
@ -137,9 +136,9 @@ void refresh_fsmonitor(struct index_state *istate)
char *buf; char *buf;
int i; int i;
if (!core_fsmonitor || has_run_once) if (!core_fsmonitor || istate->fsmonitor_has_run_once)
return; return;
has_run_once = 1; istate->fsmonitor_has_run_once = 1;
trace_printf_key(&trace_fsmonitor, "refresh fsmonitor"); trace_printf_key(&trace_fsmonitor, "refresh fsmonitor");
/* /*

1
read-cache.c
View File

@ -2307,6 +2307,7 @@ int discard_index(struct index_state *istate)
free_name_hash(istate); free_name_hash(istate);
cache_tree_free(&(istate->cache_tree)); cache_tree_free(&(istate->cache_tree));
istate->initialized = 0; istate->initialized = 0;
istate->fsmonitor_has_run_once = 0;
FREE_AND_NULL(istate->cache); FREE_AND_NULL(istate->cache);
istate->cache_alloc = 0; istate->cache_alloc = 0;
discard_split_index(istate); discard_split_index(istate);

2
t/t7519-status-fsmonitor.sh
View File

@ -346,7 +346,7 @@ test_expect_success UNTRACKED_CACHE 'ignore .git changes when invalidating UNTR'
test_cmp before after test_cmp before after
' '
test_expect_failure 'discard_index() also discards fsmonitor info' ' test_expect_success 'discard_index() also discards fsmonitor info' '
test_config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-all" && test_config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-all" &&
test_might_fail git update-index --refresh && test_might_fail git update-index --refresh &&
test-tool read-cache --print-and-refresh=tracked 2 >actual && test-tool read-cache --print-and-refresh=tracked 2 >actual &&