Re: [PATCH 1/1] [OUTREACHY] Fixed add.c file to conform to guidelines when using die() listed in issue #635
- From
Naomi Ibe <naomi.ibeh69@gmail.com>
- Date
- Oct 10, 2023, 15:19 UTC
- Message-ID
- <CACS=G2yUGGJwD05KOFZK+AV3TSNDvDEfC=pFRsLwKX_-dgt+gA@mail.gmail.com>
- In-Reply-To
- <xmqqlecbzl5e.fsf@gitster.g>
Thank you very much! I'd definitely make those changes on my next patch. Should I begin work on version 2 or should I still wait for additional input on the version 1?
On Mon, Oct 9, 2023 at 7:49 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 93 quoted lines
>
> Naomi Ibe <naomi.ibeh69@gmail.com> writes:
>
> > Subject: Re: [PATCH 1/1] [OUTREACHY] Fixed add.c file to conform to guidelines when using d
>
> Subject: [OUTREACHY][PATCH 1/1] builtin/add.c: clean up die() messages
>
> > From: Naomi <naomi.ibeh69@gmail.com>
>
> The name and address on this line come from your commit object,
> which in turn would have came from your configuration. You have
>
> [user]
> name = Naomi
> email = naomi.ibeh69@gmail.com
>
> somewhere in your configuration file, perhaps in $HOME/.gitconfig or
> somewhere. When contributiong to this project, you want that "name"
> line to also include your family name, as it should match what you
> write on your Signed-off-by: line. A focused way to do so without
> affecting your author identity for other projects is to add
>
> [user]
> name = Naomi Ibe
>
> in .git/config of the repository that you use to contribute to this
> project, e.g.,
>
> $ cd ... to the working tree of your clone of git you work in ...
> $ git config user.name "Naomi Ibe"
>
> The space above your Sign off is to fill the details you omitted on
> the title of the message (which would say something about "conform
> to guidelines" or "clean up" without mentioning what rule the
> original violates), making the whole thing something like:
>
> builtin/add.c: clean up die() messages
>
> As described in the CodingGuidelines document, a single line
> message given to die() and its friends should not capitalize its
> first word, and should not add full-stop at the end.
>
> Signed-off-by: ...
>
> > Signed-off-by: Naomi Ibe <naomi.ibeh69@gmail.com>
> > ---
> > builtin/add.c | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
>
> Thanks. Otherwise the patch looks good.
>
> >
> > diff --git a/builtin/add.c b/builtin/add.c
> > index c27254a5cd..5126d2ede3 100644
> > --- a/builtin/add.c
> > +++ b/builtin/add.c
> > @@ -182,7 +182,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
> > git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
> >
> > if (repo_read_index(the_repository) < 0)
> > - die(_("Could not read the index"));
> > + die(_("could not read the index"));
> >
> > repo_init_revisions(the_repository, &rev, prefix);
> > rev.diffopt.context = 7;
> > @@ -200,15 +200,15 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
> > die(_("editing patch failed"));
> >
> > if (stat(file, &st))
> > - die_errno(_("Could not stat '%s'"), file);
> > + die_errno(_("could not stat '%s'"), file);
> > if (!st.st_size)
> > - die(_("Empty patch. Aborted."));
> > + die(_("empty patch. aborted"));
> >
> > child.git_cmd = 1;
> > strvec_pushl(&child.args, "apply", "--recount", "--cached", file,
> > NULL);
> > if (run_command(&child))
> > - die(_("Could not apply '%s'"), file);
> > + die(_("could not apply '%s'"), file);
> >
> > unlink(file);
> > free(file);
> > @@ -568,7 +568,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
> > finish:
> > if (write_locked_index(&the_index, &lock_file,
> > COMMIT_LOCK | SKIP_IF_UNCHANGED))
> > - die(_("Unable to write new index file"));
> > + die(_("unable to write new index file"));
> >
> > dir_clear(&dir);
> > clear_pathspec(&pathspec);