mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Liam Girdwood <lrg@ti.com>, <linux-kernel@vger.kernel.org>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] merge: Make merge strategy message follow the diffstat
Date: Fri, 13 Jan 2012 11:12:22 -0800	[thread overview]
Message-ID: <7vaa5rzaax.fsf_-_@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20120111184026.GA23952@windriver.com> (Paul Gortmaker's message of "Wed, 11 Jan 2012 13:40:27 -0500")

Paul Gortmaker <paul.gortmaker@windriver.com> writes:

> By moving the message after the diffstat, there is a better chance that
> people will be aware they've done a pointless merge commit.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

I think the goal of the change may be worthy, but a few points:

 - What does "automsg" mean? Is "auto" in contrast to "manual"? Even
   better, wouldn't it be far simpler to just use

	if (msg && verbosity >= 0)
		printf("%s\n", msg);

   and get rid of this mysteriously named variable altogether?

 - Wouldn't it make more sense to move "No merge message -- not updating
   HEAD" also to the end?

 - After applying this patch, does the tests still pass?

Thanks.


  reply	other threads:[~2012-01-13 19:12 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-09  7:37 Regulator updates for 3.3 Mark Brown
2012-01-10 18:27 ` Linus Torvalds
2012-01-10 18:45   ` Mark Brown
2012-01-10 19:18     ` Linus Torvalds
2012-01-10 22:27       ` Mark Brown
2012-01-10 22:54         ` Linus Torvalds
2012-01-10 23:17           ` Mark Brown
2012-01-11  2:28           ` Junio C Hamano
2012-01-11  2:47             ` Linus Torvalds
2012-01-11  3:03               ` Junio C Hamano
2012-01-11  3:14                 ` Linus Torvalds
2012-01-11  6:59                   ` Re* " Junio C Hamano
2012-01-11 16:23                     ` Linus Torvalds
2012-01-16  0:14                     ` Pete Harlan
2012-01-16 23:33                       ` Junio C Hamano
2012-01-16 23:43                         ` Martin Fick
2012-01-17  5:33                         ` Pete Harlan
2012-01-17  6:13                           ` Junio C Hamano
2012-01-11  3:21                 ` Linus Torvalds
2012-01-11 18:40           ` Paul Gortmaker
2012-01-13 19:12             ` Junio C Hamano [this message]
2012-01-13 19:27               ` [PATCH] merge: Make merge strategy message follow the diffstat Nguyen Thai Ngoc Duy
2012-01-13 19:49                 ` Linus Torvalds
2012-01-17  8:03                   ` Miles Bader

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=7vaa5rzaax.fsf_-_@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=git@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@ti.com \
    --cc=paul.gortmaker@windriver.com \
    --cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®