Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] wt-status.c: set commitable bit if there is a meaningful merge.

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:08:16

"Philip Oakley" [off-list ref] writes:
quoted
   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?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help