git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alvaro Aleman <aaleman@redhat.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Andreas Schwab <schwab@linux-m68k.org>, git@vger.kernel.org
Subject: Re: --author arg on commit only works if there is an email configured already
Date: Fri, 21 Aug 2020 15:55:51 -0400	[thread overview]
Message-ID: <CAOW=8D3WZyoc=PpyzmPRYM2MT_=F4tnuTxJ0Z+_dHMb4Xk8imQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqr1rz96ry.fsf@gitster.c.googlers.com>

Thank you for the explanation. Yes, having the error explicitly
mention t about which of author/committer this is would be helpful.

On Fri, Aug 21, 2020 at 2:47 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Andreas Schwab <schwab@linux-m68k.org> writes:
>
> > On Aug 21 2020, Alvaro Aleman wrote:
> >
> >> It seems the `--author` arg on the `git commit` command only works if
> >> an author email is configured already somewhere:
> >
> > The `--author' argument only sets the author, but git still need to fill
> > in the committer.
>
> In other words, the --author option works just fine.  You still need
> to tell Git what committer identity you want to use, and the easiest
> way to do so is with user.{name,email} configuration variables.
>
> I wonder if it helps to give an extra line of message like the
> attached (untested) patch, though.
>
>  ident.c | 51 ++++++++++++++++++++++++++++++++++-----------------
>  1 file changed, 34 insertions(+), 17 deletions(-)
>
> diff --git a/ident.c b/ident.c
> index e666ee4e59..177ac00261 100644
> --- a/ident.c
> +++ b/ident.c
> @@ -345,18 +345,35 @@ int split_ident_line(struct ident_split *split, const char *line, int len)
>         return 0;
>  }
>
> -static const char *env_hint =
> -N_("\n"
> -   "*** Please tell me who you are.\n"
> -   "\n"
> -   "Run\n"
> -   "\n"
> -   "  git config --global user.email \"you@example.com\"\n"
> -   "  git config --global user.name \"Your Name\"\n"
> -   "\n"
> -   "to set your account\'s default identity.\n"
> -   "Omit --global to set the identity only in this repository.\n"
> -   "\n");
> +
> +static void ident_env_hint(enum want_ident whose_ident)
> +{
> +       static const char *env_hint =
> +               N_("\n"
> +                  "*** Please tell me who you are.\n"
> +                  "\n"
> +                  "Run\n"
> +                  "\n"
> +                  "  git config --global user.email \"you@example.com\"\n"
> +                  "  git config --global user.name \"Your Name\"\n"
> +                  "\n"
> +                  "to set your account\'s default identity.\n"
> +                  "Omit --global to set the identity only in this repository.\n"
> +                  "\n");
> +
> +       switch (whose_ident) {
> +       case WANT_AUTHOR_IDENT:
> +               fputs(_("Author identity unknown\n"), stderr);
> +               break;
> +       case WANT_COMMITTER_IDENT:
> +               fputs(_("Committer identity unknown\n"), stderr);
> +               break;
> +       default:
> +               break;
> +       }
> +
> +       fputs(_(env_hint), stderr);
> +}
>
>  const char *fmt_ident(const char *name, const char *email,
>                       enum want_ident whose_ident, const char *date_str, int flag)
> @@ -375,12 +392,12 @@ const char *fmt_ident(const char *name, const char *email,
>         if (!email) {
>                 if (strict && ident_use_config_only
>                     && !(ident_config_given & IDENT_MAIL_GIVEN)) {
> -                       fputs(_(env_hint), stderr);
> +                       ident_env_hint(whose_ident);
>                         die(_("no email was given and auto-detection is disabled"));
>                 }
>                 email = ident_default_email();
>                 if (strict && default_email_is_bogus) {
> -                       fputs(_(env_hint), stderr);
> +                       ident_env_hint(whose_ident);
>                         die(_("unable to auto-detect email address (got '%s')"), email);
>                 }
>         }
> @@ -397,13 +414,13 @@ const char *fmt_ident(const char *name, const char *email,
>                 if (!name) {
>                         if (strict && ident_use_config_only
>                             && !(ident_config_given & IDENT_NAME_GIVEN)) {
> -                               fputs(_(env_hint), stderr);
> +                               ident_env_hint(whose_ident);
>                                 die(_("no name was given and auto-detection is disabled"));
>                         }
>                         name = ident_default_name();
>                         using_default = 1;
>                         if (strict && default_name_is_bogus) {
> -                               fputs(_(env_hint), stderr);
> +                               ident_env_hint(whose_ident);
>                                 die(_("unable to auto-detect name (got '%s')"), name);
>                         }
>                 }
> @@ -411,7 +428,7 @@ const char *fmt_ident(const char *name, const char *email,
>                         struct passwd *pw;
>                         if (strict) {
>                                 if (using_default)
> -                                       fputs(_(env_hint), stderr);
> +                                       ident_env_hint(whose_ident);
>                                 die(_("empty ident name (for <%s>) not allowed"), email);
>                         }
>                         pw = xgetpwuid_self(NULL);
>


  reply	other threads:[~2020-08-21 19:56 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-21 16:15 --author arg on commit only works if there is an email configured already Alvaro Aleman
2020-08-21 18:28 ` Andreas Schwab
2020-08-21 18:46   ` Junio C Hamano
2020-08-21 19:55     ` Alvaro Aleman [this message]
2020-08-21 20:36       ` [PATCH] ident: say whose identity is missing when giving user.name hint Junio C Hamano
2020-08-21 20:52         ` Eric Sunshine
2020-08-21 21:13           ` Junio C Hamano
2020-08-21 21:31             ` Alvaro Aleman
2020-08-21 21:37               ` Eric Sunshine
2020-08-21 22:35                 ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAOW=8D3WZyoc=PpyzmPRYM2MT_=F4tnuTxJ0Z+_dHMb4Xk8imQ@mail.gmail.com' \
    --to=aaleman@redhat.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=schwab@linux-m68k.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).