From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Nov 2017 05:07:51 +0000 (+0900)
Subject: Merge branch 'av/fsmonitor'
X-Git-Tag: v2.16.0-rc0~111
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c9fdbca92c66b93f95a19bf1f38ab9088db78540

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
---

c9fdbca92c66b93f95a19bf1f38ab9088db78540