git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Boris 'billiob' Faure" <billiob@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] commit: do not cleanup template
Date: Sat, 7 May 2011 23:17:03 +0200	[thread overview]
Message-ID: <BANLkTinvwjoa4z2JEiuPD44BV2V_m50VYQ@mail.gmail.com> (raw)
In-Reply-To: <7vwri2uv4m.fsf@alter.siamese.dyndns.org>

On Sat, May 7, 2011 at 22:13, Junio C Hamano <gitster@pobox.com> wrote:
> […]
> My gut feeling is that it is relatively easy to justify [1/2]. We prepare
> the message file to be edited by the committer in sb by reading from
> different message sources, and usually we would want to clean up what is
> in sb before writing it out, but you may want to enforce a particular
> format by using the template (such as having a leading whitespace) and the
> way to tweak and fix that appearance should be by editing the template,
> not by automatically running stripspace() here [*1*] when the message came
> from the template.

That's exactly my point of view.

I use the commit template feature mostly to show additional pieces of
information I'd use in my editor when writing the log.
It had scratched an itch because I have to insert manually a newline
to write the commit title whenever I use a commit log template.
It's a bit strange for me to have that different behavior when writing
a commit log whether the commit log template feature is used or not.
I consider the newline being part of the template since sometimes the
template could even pre-fill the commit log title.
That's the main reason I disabled the cleanup when using a template.

> I cannot tell offhand how you justify [2/2], though. What motivated you to
> remove this blank line? At this point in the codepath, it does not look
> like it should matter if the original message came from your template or
> from somewhere else.

In the way I use the commit log template, I consider that new line
inserted there as useless.

> If the blank line is unneeded after "# You may be committing a merge..."
> for readability, wouldn't that blank line be unneeded when you took the
> message from other places, no?

Maybe.

> It might make sense to move that newline before "if (whence != FROM_COMMIT)"
> block, though, to make the logic easier to follow, regardless of the use
> of the template file.

Moving the newline there will not change my point of view on the
usefulness of it when using a template.

-- 
Boris Faure

  reply	other threads:[~2011-05-07 21:17 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-07 15:53 [PATCH 1/2] commit: do not cleanup template Boris Faure
2011-05-07 15:53 ` [PATCH 2/2] commit: do not add a newline after a template Boris Faure
2011-05-07 20:13 ` [PATCH 1/2] commit: do not cleanup template Junio C Hamano
2011-05-07 21:17   ` Boris 'billiob' Faure [this message]
2011-05-07 22:31     ` Junio C Hamano
2011-05-08  8:38   ` Sebastian Schuberth
2011-05-08  8:47   ` Sebastian Schuberth
2011-05-08 10:31     ` [PATCH/RFC v2] Do not strip empty lines / trailing spaces from a commit message template Boris Faure
2011-05-08 12:28       ` Sebastian Schuberth
2011-05-08 18:14         ` Junio C Hamano
2011-05-08 18:55           ` [PATCH/RFC v3] " Boris Faure

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=BANLkTinvwjoa4z2JEiuPD44BV2V_m50VYQ@mail.gmail.com \
    --to=billiob@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).