From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Feb 2016 21:54:48 GMT
Subject: Re: [PATCH] wt-status.c: set commitable bit if there is a meaningful merge.
Message-ID: <xmqqa8n0mic7.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <C8BDC3289C184F40BFBE3B150CFBB50B@PhilipOakley>

"Philip Oakley" <philipoakley@iee.org> writes:

>>    It appeared that the conditional for 'Reject an attempt to record a
>>    non-merge empty commit without * explicit --allow-empty.' could be
>>    simplified after adding this patch.
>>
>>    This change can't be propagated to the conditional because it allows
>>    a commit that was previously disallowed.

This last sentence sounds somewhat worrysome.  Does that mean some
commit that was previously disallowed (which ones?) is still
forbidden by "commit" without "--dry-run" (which is correct--we are
not interested in changing the behaviour of the main codepath), but
"--dry-run", even with this update, will say "OK you will make a
meaningful commit" by exiting with 0 for such disallowed commit?