# [Patch] Error message grammar 4 messages from 2011-03-02 to 2011-03-06. Participants: a.j.delaney@brighton.ac.uk, Matthieu Moy. Thread: https://gitlist.dev/t/26641 ## a.j.delaney@brighton.ac.uk, 2011-03-02 21:37 Subject: [Patch] Error message grammar Message-ID: <1299101838.2807.54.camel@SillyFace> URL: https://gitlist.dev/e/1299101838.2807.54.camel%40SillyFace ``` Dear all, I got an error message from git and the grammar tweaked me (maybe it's just the mood I'm in). I'm not subscribed to the list. -- Aidan ___________________________________________________________ This email has been scanned by MessageLabs' Email Security System on behalf of the University of Brighton. For more information see http://www.brighton.ac.uk/is/spam/ ___________________________________________________________ >From 743d2eda72eb393bee41ac98a3994d110916b08a Mon Sep 17 00:00:00 2001 From: Aidan Delaney Date: Wed, 2 Mar 2011 21:30:36 +0000 Subject: [PATCH] Fixed grammar on two error messages. --- builtin/commit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 355b2cb..d56ddeb 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -991,9 +991,9 @@ static int parse_and_validate_options(int argc, const char *argv[], handle_untracked_files_arg(s); if (all && argc > 0) - die("Paths with -a does not make sense."); + die("Using paths with -a does not make sense."); else if (interactive && argc > 0) - die("Paths with --interactive does not make sense."); + die("Using paths with --interactive does not make sense."); if (null_termination && status_format == STATUS_FORMAT_LONG) status_format = STATUS_FORMAT_PORCELAIN; -- 1.7.4 ``` ## Matthieu Moy, 2011-03-02 22:03 Subject: Re: [Patch] Error message grammar Message-ID: URL: https://gitlist.dev/e/vpqd3m9yycf.fsf%40bauges.imag.fr In-Reply-To: <1299101838.2807.54.camel@SillyFace> ``` A.J.Delaney@brighton.ac.uk writes: > Dear all, > I got an error message from git and the grammar tweaked me (maybe it's > just the mood I'm in). I'm not subscribed to the list. Please, read http://repo.or.cz/w/git.git/blob_plain?f=Documentation/SubmittingPatches in particular the Signed-off-by part and the "don't attach patches" one. Otherwise, your contribution cannot be included in Git. Other than that, the patch looks good. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ``` ## a.j.delaney@brighton.ac.uk, 2011-03-06 15:21 Subject: Re: [Patch] Error message grammar Message-ID: <1299424888.4990.13.camel@SillyFace> URL: https://gitlist.dev/e/1299424888.4990.13.camel%40SillyFace In-Reply-To: ``` Matthieu, On Wed, 2011-03-02 at 23:03 +0100, Matthieu Moy wrote: > Please, read > http://repo.or.cz/w/git.git/blob_plain?f=Documentation/SubmittingPatches > in particular the Signed-off-by part and the "don't attach patches" > one. Thanks for the pointer. Based on master f70f736bcbb22cfe434eaf20089d9713b991ee31 Trivial changes to grammar on some error messages reported by git-commit. I certify conformance to Developer's Certificate of Origin 1.1. Signed-off-by: Aidan Delaney --- builtin/commit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 355b2cb..d56ddeb 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -991,9 +991,9 @@ static int parse_and_validate_options(int argc, const char *argv[], handle_untracked_files_arg(s); if (all && argc > 0) - die("Paths with -a does not make sense."); + die("Using paths with -a does not make sense."); else if (interactive && argc > 0) - die("Paths with --interactive does not make sense."); + die("Using paths with --interactive does not make sense."); if (null_termination && status_format == STATUS_FORMAT_LONG) status_format = STATUS_FORMAT_PORCELAIN; -- 1.7.4 -- Aidan Delaney ``` ## Matthieu Moy, 2011-03-06 17:38 Subject: Re: [Patch] Error message grammar Message-ID: URL: https://gitlist.dev/e/vpq8vwsp2s8.fsf%40bauges.imag.fr In-Reply-To: <1299424888.4990.13.camel@SillyFace> ``` A.J.Delaney@brighton.ac.uk writes: > Matthieu, > On Wed, 2011-03-02 at 23:03 +0100, Matthieu Moy wrote: >> Please, read >> http://repo.or.cz/w/git.git/blob_plain?f=Documentation/SubmittingPatches >> in particular the Signed-off-by part and the "don't attach patches" >> one. > Thanks for the pointer. Now, you should read the part about what goes before and after the --- in the message ;-). The body of the email (before ---) will become the commit message, you want it clean and self-contained. Discussions should go after the ---. If you don't follow this, our maintainer will have to fix it manually... > Based on master f70f736bcbb22cfe434eaf20089d9713b991ee31 This is not needed, and if you add it, put it after ---. > I certify conformance to Developer's Certificate of Origin 1.1. > > Signed-off-by: Aidan Delaney Just the Signed-off-by is sufficient. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ```