Web lists-archives.com

Re: [PATCH v2 1/2] config: allow giving separate author and committer idents




On Fri, Jan 25, 2019 at 11:58:10PM +0100, Ævar Arnfjörð Bjarmason wrote:
> 
> On Fri, Jan 25 2019, William Hubbs wrote:
> 
> > diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt
> > index b5b2ba1199..18e1ec3c1b 100644
> > --- a/Documentation/config/user.txt
> > +++ b/Documentation/config/user.txt
> > @@ -1,12 +1,39 @@
> > +author.email::
> > +	The email address used for the author of newly
> > +	created commits.  Defaults to the value of the
> > +	`GIT_AUTHOR_EMAIL` environment variable, or if
> > +	the environment variable is not set, the `user.email`
> > +	configuration variable.
> > +
> > +author.name::
> > +	The full name used for the author of newly created commits.
> > +	Defaults to the value of the `GIT_AUTHOR_NAME` environment variable, or
> > +	if the environment variable is not set,
> > +	the `user.email` configuration variable.
> > +
> > +committer.email::
> > +	The email address used for the committer of newly created commits.
> > +	Defaults to the value of the `GIT_COMMITTER_EMAIL` environment
> > +	variable, or if the environment variable is not set, the `user.email`
> > +	configuration variable.
> > +
> > +committer.name::
> > +	The full name used for the committer of newly created commits.
> > +	Defaults to the value of the `GIT_COMMITTER_NAME` environment
> > +	variable, or if the environment variable is not set, the `user.name`
> > +	configuration variable.
> > +
> >  user.email::
> >  	Your email address to be recorded in any newly created commits.
> >  	Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and
> > -	`EMAIL` environment variables.  See linkgit:git-commit-tree[1].
> > +	`EMAIL` environment variables or the `author.email` or
> > +	`committer.email` settings discussed above. See linkgit:git-commit-tree[1].
> >
> >  user.name::
> >  	Your full name to be recorded in any newly created commits.
> >  	Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME`
> > -	environment variables.  See linkgit:git-commit-tree[1].
> > +	environment variables or the `author.name` or `committer.name`
> > +	settings discussed above. See linkgit:git-commit-tree[1].
> 
> Looks correct, although I wonder if we're at the point where it would be
> better to present this info as a table.

Maybe, but can we have someone do that in a separate patch? I ask
because the documentation is not in a markup language and that would
make setting up a table difficult for me at best with my screen reader.

> > diff --git a/builtin/am.c b/builtin/am.c
> > index 95370313b6..53fdd22c45 100644
> > --- a/builtin/am.c
> > +++ b/builtin/am.c
> > @@ -1594,7 +1594,7 @@ static void do_commit(const struct am_state *state)
> >  	}
> >
> >  	author = fmt_ident(state->author_name, state->author_email,
> > -			state->ignore_date ? NULL : state->author_date,
> > +			WANT_AUTHOR_IDENT, state->ignore_date ? NULL : state->author_date,
> 
> This & a few other things in this series take the code beyond 79
> characters.

This doesn't look like it is beyond 79 characters to me, but that may be
because I use a tab stop width of 4.

Can you reply again and flag the lines that are longer than 79
characters?

Thanks,

William