Re: [PATCH] merge: Make merge strategy message follow the diffstat

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 13, 2012, 19:12 UTC
Message-ID: <7vaa5rzaax.fsf_-_@alter.siamese.dyndns.org>
In-Reply-To: <20120111184026.GA23952@windriver.com>

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.