From: Ben Peart Date: Wed, 04 Oct 2017 12:27:47 GMT Subject: Re: [PATCH v8 00/12] Fast git status via a file system watcher Message-ID: In-Reply-To: On 10/3/2017 10:09 PM, Junio C Hamano wrote: > Ben Peart writes: > >> Well, rats. I found one more issue that applies to two of the >> commits. Can you squash this in as well or do you want it in some >> other form? > > Rats indeed. Let's go incremental as promised, perhaps like this > (but please supply a better description if you have one). Thank you. Looks good. > > -- >8 -- > From: Ben Peart > Subject: fsmonitor: MINGW support for watchman integration > > Instead of just taking $ENV{'PWD'}, use the same logic that converts > PWD to $git_work_tree on MSYS_NT in the watchman integration hook > script also on MINGW. > > Signed-off-by: Ben Peart > Signed-off-by: Junio C Hamano > --- > t/t7519/fsmonitor-watchman | 2 +- > templates/hooks--fsmonitor-watchman.sample | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/t/t7519/fsmonitor-watchman b/t/t7519/fsmonitor-watchman > index 7ceb32dc18..cca3d71e90 100755 > --- a/t/t7519/fsmonitor-watchman > +++ b/t/t7519/fsmonitor-watchman > @@ -36,7 +36,7 @@ my $system = `uname -s`; > $system =~ s/[\r\n]+//g; > my $git_work_tree; > > -if ($system =~ m/^MSYS_NT/) { > +if ($system =~ m/^MSYS_NT/ || $system =~ m/^MINGW/) { > $git_work_tree = `cygpath -aw "\$PWD"`; > $git_work_tree =~ s/[\r\n]+//g; > $git_work_tree =~ s,\\,/,g; > diff --git a/templates/hooks--fsmonitor-watchman.sample b/templates/hooks--fsmonitor-watchman.sample > index 870a59d237..c68038ef00 100755 > --- a/templates/hooks--fsmonitor-watchman.sample > +++ b/templates/hooks--fsmonitor-watchman.sample > @@ -35,7 +35,7 @@ my $system = `uname -s`; > $system =~ s/[\r\n]+//g; > my $git_work_tree; > > -if ($system =~ m/^MSYS_NT/) { > +if ($system =~ m/^MSYS_NT/ || $system =~ m/^MINGW/) { > $git_work_tree = `cygpath -aw "\$PWD"`; > $git_work_tree =~ s/[\r\n]+//g; > $git_work_tree =~ s,\\,/,g; >