git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Tan <jonathantanmy@google.com>
To: gitster@pobox.com
Cc: gitgitgadget@gmail.com, git@vger.kernel.org, heba.waly@gmail.com,
	Jonathan Tan <jonathantanmy@google.com>
Subject: Re: [PATCH v2 1/1] commit: display advice hints when commit fails
Date: Mon, 30 Dec 2019 16:04:20 -0800	[thread overview]
Message-ID: <20191231000420.32396-1-jonathantanmy@google.com> (raw)
In-Reply-To: <xmqqbls4aznl.fsf@gitster-ct.c.googlers.com>

> > This fix was about "we do not want to unconditionally drop the
> > advice messages when we reject the attempt to commit and show the
> > output like 'git status'", wasn't it?  The earlier single-liner fix
> > in v1 that flips s->hints just before calling run_status() before
> > rejecting the attempt to commit was a lot easier to reason about, as
> > the fix was very focused and to the point.  Why are we seeing this
> > many (seemingly unrelated) changes?
> 
> In any case, here is what I tentatively have in my tree (with heavy
> rewrite to the proposed log message).

Junio, what are your plans over what you have in your tree? If you'd
like to hear Heba's opinion on it, then she can chime in; if you'd like
a review, then I think it's good to go in.

I think the main area of discussion is whether we should go with Heba's
attempt to address Emily's comment [1]:

> I think the intent of that commit was to not put hints into the editor,
> so does it make sense to instead wrap this guy:
> 
>   /*                                                                       
>    * Most hints are counter-productive when the commit has                 
>    * already started.                                                      
>    */                                                                      
>   s->hints = 0;  
> 
> in "if (use_editor)"?
> 
> I didn't try it on my end. Maybe it won't help much, because we think
> we're going to use the editor right up until we realize it's not
> committable?

And I think the answer to that is "s" is used throughout the function in
various ways (in particular, used to print statuses both to stdout and
to the message template) so any wrapping or corralling of scope would
just make things more complicated. In particular, the way Heba did it in
v2 is more unclear - at the time of setting s->hints = 0, it's done
within a "if (use_editor && include_status)" block, but (as far as I can
tell) the commit message template might also be used when there is no
editor - for example, as input to a hook. And more importantly, when
s->hints is reset to the config, we don't know at that point that the
next status is going to stdout. So I think it's better just to use the
v1 way.

The second area of discussion I see is in the commit message. Commit
messages have to balance brevity and comprehensiveness, and this can be
a subjective matter, but I think Junio's strikes a good balance.

[1] https://lore.kernel.org/git/20191217224541.GA230678@google.com/

  parent reply	other threads:[~2019-12-31  0:04 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-17  9:17 [PATCH 0/1] [Outreachy] commit: display advice hints when commit fails Heba Waly via GitGitGadget
2019-12-17  9:17 ` [PATCH 1/1] " Heba Waly via GitGitGadget
2019-12-17 22:41   ` Junio C Hamano
2019-12-17 22:45   ` Emily Shaffer
2019-12-19  3:47     ` Heba Waly
2019-12-18  3:13   ` Jonathan Tan
2019-12-18 18:14     ` Junio C Hamano
2019-12-19  3:48     ` Heba Waly
2019-12-19  9:16 ` [PATCH v2 0/1] [Outreachy] " Heba Waly via GitGitGadget
2019-12-19  9:16   ` [PATCH v2 1/1] " Heba Waly via GitGitGadget
2019-12-19 19:14     ` Junio C Hamano
2019-12-19 19:22       ` Junio C Hamano
2019-12-19 19:47         ` Eric Sunshine
2019-12-19 19:57           ` Junio C Hamano
2019-12-20  2:31         ` Emily Shaffer
2019-12-20 18:34           ` Junio C Hamano
2019-12-20 21:39             ` Emily Shaffer
2019-12-31  0:04         ` Jonathan Tan [this message]
2019-12-31 19:06           ` Junio C Hamano
2020-01-02 19:56             ` Jonathan Tan
2019-12-19 18:26   ` [PATCH v2 0/1] [Outreachy] " Junio C Hamano
2019-12-19 18:54     ` Emily Shaffer
2019-12-19 19:23       ` Junio C Hamano
2019-12-19 19:45         ` Junio C Hamano
2019-12-21  4:37           ` Heba Waly
2019-12-21 23:54             ` Junio C Hamano
2019-12-21  5:02   ` Heba Waly

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=20191231000420.32396-1-jonathantanmy@google.com \
    --to=jonathantanmy@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    --cc=heba.waly@gmail.com \
    /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).