Re: [PATCH v8 00/12] Fast git status via a file system watcher
- From
Ben Peart <peartben@gmail.com>
- Date
- Oct 3, 2017, 19:48 UTC
- Message-ID
- <fd972756-4ad3-4b96-23d0-e2c9e59189d1@gmail.com>
- In-Reply-To
- <xmqqk20fuvg7.fsf@gitster.mtv.corp.google.com>
On 10/1/2017 4:24 AM, Junio C Hamano wrote:
Show 29 quoted lines
> Ben Peart <Ben.Peart@microsoft.com> writes: > >> I had accumulated the same set of changes with one addition of removing >> a duplicate "the" from a comment in the fsmonitor.h file: >> >> diff --git a/fsmonitor.h b/fsmonitor.h >> index 8eb6163455..0de644e01a 100644 >> --- a/fsmonitor.h >> +++ b/fsmonitor.h >> @@ -4,7 +4,7 @@ >> extern struct trace_key trace_fsmonitor; >> >> /* >> - * Read the the fsmonitor index extension and (if configured) restore the >> + * Read the fsmonitor index extension and (if configured) restore the >> * CE_FSMONITOR_VALID state. >> */ >> extern int read_fsmonitor_extension(struct index_state *istate, const void *data, unsigned long sz); >> >>> >>> Thanks. > > OK, now my copy has the same, so we are in sync. Unless there is no > more comment that benefits from a reroll of the series, let's run > with this version for now and merge it to 'next'. Further updates > can be done incrementally on top. > > Thanks. >
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?
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;