From: Junio C Hamano <gitster@pobox.com>
To: "Philip Oakley" <philipoakley@iee.org>
Cc: "Stephen P. Smith" <ischis2@cox.net>,
"Git Mailing List" <git@vger.kernel.org>,
"Ovidiu Gheorghioiu" <ovidiug@gmail.com>
Subject: Re: [PATCH] wt-status.c: set commitable bit if there is a meaningful merge.
Date: Tue, 16 Feb 2016 13:54:48 -0800 [thread overview]
Message-ID: <xmqqa8n0mic7.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <C8BDC3289C184F40BFBE3B150CFBB50B@PhilipOakley> (Philip Oakley's message of "Tue, 16 Feb 2016 08:20:43 -0000")
"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?
next prev parent reply other threads:[~2016-02-16 21:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1649296.sC1eN3ni6k@thunderbird>
2016-02-09 1:55 ` Bug report: 'git commit --dry-run' corner case: returns error ("nothing to commit") when all conflicts resolved to HEAD Stephen & Linda Smith
2016-02-16 2:38 ` [PATCH] wt-status.c: set commitable bit if there is a meaningful merge Stephen P. Smith
2016-02-16 8:20 ` Philip Oakley
2016-02-16 21:54 ` Junio C Hamano [this message]
2016-02-16 23:26 ` Stephen & Linda Smith
2016-02-16 23:40 ` Stephen & Linda Smith
2016-02-16 23:30 ` Stephen & Linda Smith
2016-02-17 3:33 ` Junio C Hamano
2016-02-17 5:06 ` [PATCH v2] " Stephen P. Smith
2016-02-17 4:58 ` [PATCH] " Stephen & Linda Smith
2016-05-10 4:51 ` Stephen & Linda Smith
2018-08-22 5:33 ` Stephen Smith
2018-08-22 15:39 ` Junio C Hamano
2018-08-22 15:54 ` Junio C Hamano
2018-08-23 1:28 ` Stephen & Linda Smith
2016-02-12 1:04 ` Bug report: 'git commit --dry-run' corner case: returns error ("nothing to commit") when all conflicts resolved to HEAD Stephen & Linda Smith
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=xmqqa8n0mic7.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=ischis2@cox.net \
--cc=ovidiug@gmail.com \
--cc=philipoakley@iee.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.