From: Ben Peart <peartben@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Ben Peart" <benpeart@microsoft.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>,
"David Turner" <David.Turner@twosigma.com>,
"Jeff King" <peff@peff.net>,
"Christian Couder" <christian.couder@gmail.com>
Subject: Re: [PATCH v4 0/6] Fast git status via a file system watcher
Date: Thu, 1 Jun 2017 17:06:38 -0400 [thread overview]
Message-ID: <020b09ef-6035-285d-c033-8831564d8752@gmail.com> (raw)
In-Reply-To: <CACBZZX6+V6=gSs0pdN9WU+LPZv5qSAmE5u_f=NFYht2dT-hxEQ@mail.gmail.com>
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?
next prev parent reply other threads:[~2017-06-01 21:06 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-01 15:50 [PATCH v4 0/6] Fast git status via a file system watcher Ben Peart
2017-06-01 15:51 ` [PATCH v4 1/6] bswap: add 64 bit endianness helper get_be64 Ben Peart
2017-06-01 15:51 ` [PATCH v4 2/6] dir: make lookup_untracked() available outside of dir.c Ben Peart
2017-06-01 15:51 ` [PATCH v4 3/6] fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files Ben Peart
2017-06-01 15:51 ` [PATCH v4 4/6] fsmonitor: add test cases for fsmonitor extension Ben Peart
2017-06-01 15:51 ` [PATCH v4 5/6] fsmonitor: add documentation for the " Ben Peart
2017-06-01 15:51 ` [PATCH v4 6/6] fsmonitor: add a sample query-fsmonitor hook script for Watchman Ben Peart
2017-06-07 21:38 ` Ævar Arnfjörð Bjarmason
2017-06-01 19:57 ` [PATCH v4 0/6] Fast git status via a file system watcher Ævar Arnfjörð Bjarmason
2017-06-01 21:06 ` Ben Peart [this message]
2017-06-01 21:12 ` Ævar Arnfjörð Bjarmason
2017-06-01 21:13 ` Stefan Beller
2017-06-01 21:26 ` Jeff King
2017-06-01 20:51 ` Ævar Arnfjörð Bjarmason
2017-06-01 21:13 ` Ævar Arnfjörð Bjarmason
2017-06-02 0:40 ` Ben Peart
2017-06-02 10:28 ` [WIP/PATCH 7/6] perf: add a performance test for core.fsmonitor Ævar Arnfjörð Bjarmason
2017-06-02 21:44 ` David Turner
2017-06-03 18:08 ` Ævar Arnfjörð Bjarmason
2017-06-05 14:27 ` Ben Peart
2017-06-02 22:05 ` Ben Peart
2017-06-02 23:06 ` Ævar Arnfjörð Bjarmason
2017-06-07 19:51 ` Ben Peart
2017-06-07 21:46 ` Ævar Arnfjörð Bjarmason
2017-06-08 1:57 ` Ben Peart
2017-06-04 1:59 ` Junio C Hamano
2017-06-04 7:46 ` Ævar Arnfjörð Bjarmason
2017-06-04 8:21 ` Jeff King
2017-06-02 1:56 ` [PATCH v4 0/6] Fast git status via a file system watcher Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=020b09ef-6035-285d-c033-8831564d8752@gmail.com \
--to=peartben@gmail.com \
--cc=David.Turner@twosigma.com \
--cc=avarab@gmail.com \
--cc=benpeart@microsoft.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).