Re: [PATCH v4 0/6] Fast git status via a file system watcher

> On 6/1/2017 3:57 PM, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Thu, Jun 1, 2017 at 5:50 PM, Ben Peart <peartben@gmail.com> wrote:
>>>
>>> Changes from V3 include:
>>>   - update test script based on feedback
>>>   - update template hook proc with better post-processing code and make
>>>     it executable
>>
>>
>> Thanks, exciting stuff, do you have this pushed somewhere? I didn't
>> spot it it in your github repo. I had some issues applying this on top
>> of master @ 0339965c70, on 5/6 I got
>>
>
> I just pushed this to github at
> https://github.com/benpeart/git-for-windows/tree/fsmonitor
>
>>      $ git am /tmp/original_msg.txt
>>      Applying: fsmonitor: add documentation for the fsmonitor extension.
>>      error: patch failed: Documentation/githooks.txt:448
>>      error: Documentation/githooks.txt: patch does not apply
>>      Patch failed at 0001 fsmonitor: add documentation for the
>> fsmonitor extension.
>>      The copy of the patch that failed is found in:
>> .git/rebase-apply/patch
>>      When you have resolved this problem, run "git am --continue".
>>      If you prefer to skip this patch, run "git am --skip" instead.
>>      To restore the original branch and stop patching, run "git am
>> --abort".
>>
>
> Sorry, no idea on why this didn't work.  The patch was formatted with git
> format-patch but it's possible I've got something wrong.

>> But it worked with patch, weirdly enough:
>>
>>      $ patch -p1 </tmp/original_msg.txt
>>      (Stripping trailing CRs from patch; use --binary to disable.)
>>      patching file Documentation/config.txt
>>      Hunk #1 succeeded at 410 (offset 21 lines).
>>      (Stripping trailing CRs from patch; use --binary to disable.)
>>      patching file Documentation/githooks.txt
>>      Hunk #1 succeeded at 456 with fuzz 1 (offset 8 lines).
>>      (Stripping trailing CRs from patch; use --binary to disable.)
>>      patching file Documentation/technical/index-format.txt
>>
>> The 6/6 patch failed due to an unknown charset y, you have
>> "Content-Type: text/plain; charset=y" in the header, worked after
>> manually munging it to "UTF-8", although it gave a warning...
>>
>
> The only thing I see different about this patch is the special characters of
> your name in the sign-off line.  The call to git send-email prompted me
> about encoding - I wonder if my answer was incorrect?  Given you've probably
> dealt with your name in git patches before :), what should my answer be?