{"thread":{"id":"13340","subject":"[PATCH] Documentation: hooks: fix missing verb in pre-applypatch description","startedAt":"2008-05-01T08:17:59Z","lastAt":"2008-05-01T09:56:16Z","messageCount":2,"participants":["Christian Couder","Thomas Adam"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"75736","messageId":"20080501101759.0f40268e.chriscool@tuxfamily.org","threadId":"13340","inReplyTo":null,"subject":"[PATCH] Documentation: hooks: fix missing verb in pre-applypatch description","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2008-05-01T08:17:59Z","receivedAt":"2008-05-01T08:17:59Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Signed-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n Documentation/githooks.txt |    9 +++++----\n 1 files changed, 5 insertions(+), 4 deletions(-)\n\n\tManoj Srivastava a écrit :\n\t>         I am afraid I can't parse the final sentence: I assume it means\n\t>  that the patched working tree is not committed, but the missing verb\n\t>  makes it harder for non-native speakers of the english language to\n\t>  understand what is meant here.\n\n\tPerhaps something like this patch would fix it.\n\ndiff --git a/Documentation/githooks.txt b/Documentation/githooks.txt\nindex 62ee065..0ede1ac 100644\n--- a/Documentation/githooks.txt\n+++ b/Documentation/githooks.txt\n@@ -40,10 +40,11 @@ The default 'applypatch-msg' hook, when enabled, runs the\n pre-applypatch\n --------------\n \n-This hook is invoked by `git-am`.  It takes no parameter,\n-and is invoked after the patch is applied, but before a commit\n-is made.  Exiting with non-zero status causes the working tree\n-after application of the patch not committed.\n+This hook is invoked by `git-am`.  It takes no parameter, and is\n+invoked after the patch is applied, but before a commit is made.\n+\n+If it exits with non-zero status, then the working tree will not be\n+committed after application of the patch.\n \n It can be used to inspect the current working tree and refuse to\n make a commit if it does not pass certain test.\n-- \n1.5.5.1.100.gc23d\n"},{"id":"75738","messageId":"18071eea0805010256j7f442230od4e0483905830b2b@mail.gmail.com","threadId":"13340","inReplyTo":"20080501101759.0f40268e.chriscool@tuxfamily.org","subject":"Re: [PATCH] Documentation: hooks: fix missing verb in pre-applypatch description","fromName":"Thomas Adam","fromEmail":"thomas.adam22@gmail.com","sentAt":"2008-05-01T09:56:16Z","receivedAt":"2008-05-01T09:56:16Z","isPatch":true,"sender":{"key":"thomas.adam22@gmail.com","avatar":"https://gravatar.com/avatar/137f9858bc6bfd5b2f743aefd988c81ce0cbd306248889df80e269519cfc8741?d=mp&s=160"},"body":"On 01/05/2008, Christian Couder <chriscool@tuxfamily.org> wrote:\n>  +If it exits with non-zero status, then the working tree will not be\n>  +committed after application of the patch.\n\nThat's even worse.\n\n\"committed after application of the patch\".  Too formal, and a little odd.  Try:\n\n\"committed after applying the patch.\"\n\n-- Thomas Adam\n"}]}