{"thread":{"id":"26641","subject":"[Patch] Error message grammar","startedAt":"2011-03-02T21:37:18Z","lastAt":"2011-03-06T17:38:47Z","messageCount":4,"participants":["a.j.delaney@brighton.ac.uk","Matthieu Moy"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"162678","messageId":"1299101838.2807.54.camel@SillyFace","threadId":"26641","inReplyTo":null,"subject":"[Patch] Error message grammar","fromName":"","fromEmail":"a.j.delaney@brighton.ac.uk","sentAt":"2011-03-02T21:37:18Z","receivedAt":"2011-03-02T21:37:18Z","isPatch":true,"sender":{"key":"a.j.delaney@brighton.ac.uk","avatar":null},"body":"Dear all,\n\tI got an error message from git and the grammar tweaked me (maybe it's\njust the mood I'm in). I'm not subscribed to the list.\n\n-- \nAidan\n\n\n___________________________________________________________\nThis email has been scanned by MessageLabs' Email Security\nSystem on behalf of the University of Brighton.\nFor more information see http://www.brighton.ac.uk/is/spam/\n___________________________________________________________\n\n>From 743d2eda72eb393bee41ac98a3994d110916b08a Mon Sep 17 00:00:00 2001\nFrom: Aidan Delaney \nDate: Wed, 2 Mar 2011 21:30:36 +0000\nSubject: [PATCH] Fixed grammar on two error messages.\n\n---\n builtin/commit.c | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 355b2cb..d56ddeb 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -991,9 +991,9 @@ static int parse_and_validate_options(int argc, const char *argv[],\n \thandle_untracked_files_arg(s);\n \n \tif (all && argc > 0)\n-\t\tdie(\"Paths with -a does not make sense.\");\n+\t\tdie(\"Using paths with -a does not make sense.\");\n \telse if (interactive && argc > 0)\n-\t\tdie(\"Paths with --interactive does not make sense.\");\n+\t\tdie(\"Using paths with --interactive does not make sense.\");\n \n \tif (null_termination && status_format == STATUS_FORMAT_LONG)\n \t\tstatus_format = STATUS_FORMAT_PORCELAIN;\n-- \n1.7.4\n\n"},{"id":"162684","messageId":"vpqd3m9yycf.fsf@bauges.imag.fr","threadId":"26641","inReplyTo":"1299101838.2807.54.camel@SillyFace","subject":"Re: [Patch] Error message grammar","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2011-03-02T22:03:12Z","receivedAt":"2011-03-02T22:03:12Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"A.J.Delaney@brighton.ac.uk writes:\n\n> Dear all,\n> \tI got an error message from git and the grammar tweaked me (maybe it's\n> just the mood I'm in). I'm not subscribed to the list.\n\nPlease, read\nhttp://repo.or.cz/w/git.git/blob_plain?f=Documentation/SubmittingPatches\nin particular the Signed-off-by part and the \"don't attach patches\"\none. Otherwise, your contribution cannot be included in Git.\n\nOther than that, the patch looks good.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"162846","messageId":"1299424888.4990.13.camel@SillyFace","threadId":"26641","inReplyTo":"vpqd3m9yycf.fsf@bauges.imag.fr","subject":"Re: [Patch] Error message grammar","fromName":"","fromEmail":"a.j.delaney@brighton.ac.uk","sentAt":"2011-03-06T15:21:28Z","receivedAt":"2011-03-06T15:21:28Z","isPatch":true,"sender":{"key":"a.j.delaney@brighton.ac.uk","avatar":null},"body":"Matthieu,\nOn Wed, 2011-03-02 at 23:03 +0100, Matthieu Moy wrote:\n> Please, read\n> http://repo.or.cz/w/git.git/blob_plain?f=Documentation/SubmittingPatches\n> in particular the Signed-off-by part and the \"don't attach patches\"\n> one.\nThanks for the pointer.\n\nBased on master f70f736bcbb22cfe434eaf20089d9713b991ee31\n\nTrivial changes to grammar on some error messages reported by\ngit-commit.\n\nI certify conformance to Developer's Certificate of Origin 1.1.\n\nSigned-off-by: Aidan Delaney \n---\n builtin/commit.c | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 355b2cb..d56ddeb 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -991,9 +991,9 @@ static int parse_and_validate_options(int argc,\nconst char *argv[],\n \thandle_untracked_files_arg(s);\n \n \tif (all && argc > 0)\n-\t\tdie(\"Paths with -a does not make sense.\");\n+\t\tdie(\"Using paths with -a does not make sense.\");\n \telse if (interactive && argc > 0)\n-\t\tdie(\"Paths with --interactive does not make sense.\");\n+\t\tdie(\"Using paths with --interactive does not make sense.\");\n \n \tif (null_termination && status_format == STATUS_FORMAT_LONG)\n \t\tstatus_format = STATUS_FORMAT_PORCELAIN;\n-- \n1.7.4\n\n\n-- \nAidan Delaney\n"},{"id":"162849","messageId":"vpq8vwsp2s8.fsf@bauges.imag.fr","threadId":"26641","inReplyTo":"1299424888.4990.13.camel@SillyFace","subject":"Re: [Patch] Error message grammar","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2011-03-06T17:38:47Z","receivedAt":"2011-03-06T17:38:47Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"A.J.Delaney@brighton.ac.uk writes:\n\n> Matthieu,\n> On Wed, 2011-03-02 at 23:03 +0100, Matthieu Moy wrote:\n>> Please, read\n>> http://repo.or.cz/w/git.git/blob_plain?f=Documentation/SubmittingPatches\n>> in particular the Signed-off-by part and the \"don't attach patches\"\n>> one.\n> Thanks for the pointer.\n\nNow, you should read the part about what goes before and after the ---\nin the message ;-).\n\nThe body of the email (before ---) will become the commit message, you\nwant it clean and self-contained. Discussions should go after the ---.\nIf you don't follow this, our maintainer will have to fix it\nmanually...\n\n> Based on master f70f736bcbb22cfe434eaf20089d9713b991ee31\n\nThis is not needed, and if you add it, put it after ---.\n\n> I certify conformance to Developer's Certificate of Origin 1.1.\n>\n> Signed-off-by: Aidan Delaney \n\nJust the Signed-off-by is sufficient.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"}]}