diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:07:51 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-21 14:07:51 +0900 |
commit | c9fdbca92c66b93f95a19bf1f38ab9088db78540 (patch) | |
tree | b0aaedc6f6c92d0de8a8fe49a19f8522653bcd96 /fsmonitor.h | |
parent | e05336bddacb90cf243aacc0f7b7f34f900453d7 (diff) | |
parent | 1fff303fc2b31d5005f38f55f38c4e8521da5a93 (diff) | |
download | git-c9fdbca92c66b93f95a19bf1f38ab9088db78540.tar.gz git-c9fdbca92c66b93f95a19bf1f38ab9088db78540.tar.xz |
Merge branch 'av/fsmonitor'
Various fixes to bp/fsmonitor topic.
* av/fsmonitor:
fsmonitor: simplify determining the git worktree under Windows
fsmonitor: store fsmonitor bitmap before splitting index
fsmonitor: read from getcwd(), not the PWD environment variable
fsmonitor: delay updating state until after split index is merged
fsmonitor: document GIT_TRACE_FSMONITOR
fsmonitor: don't bother pretty-printing JSON from watchman
fsmonitor: set the PWD to the top of the working tree
Diffstat (limited to 'fsmonitor.h')
-rw-r--r-- | fsmonitor.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fsmonitor.h b/fsmonitor.h index 0de644e01..cd3cc0ccf 100644 --- a/fsmonitor.h +++ b/fsmonitor.h @@ -10,7 +10,14 @@ extern struct trace_key trace_fsmonitor; extern int read_fsmonitor_extension(struct index_state *istate, const void *data, unsigned long sz); /* - * Write the CE_FSMONITOR_VALID state into the fsmonitor index extension. + * Fill the fsmonitor_dirty ewah bits with their state from the index, + * before it is split during writing. + */ +extern 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. */ extern void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate); |