From: Stephen & Linda Smith <ischis2@cox.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Philip Oakley <philipoakley@iee.org>,
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 16:40:05 -0700 [thread overview]
Message-ID: <3639645.80CNmLM0I7@thunderbird> (raw)
In-Reply-To: C8BDC3289C184F40BFBE3B150CFBB50B@PhilipOakley
On Tuesday, February 16, 2016 04:26:38 PM Stephen & Linda Smith wrote:
> On Tuesday, February 16, 2016 01:54:48 PM Junio C Hamano wrote:
> > "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?
> I tried to think of a better set of wording. Finally I decided to make it part of the note
> rather than the commit message so that it could be debated as part of the review
> but not be part of the commit record for the line being changed.
>
> The patch doesn't change behaviour other than the dry-run return code
> which now matches the return code of commit. The one line change is not changing the
> main code path behaviour
>
I am not adverse to moving the change to dry_run_commit() proper,
but that would mean a slightly larger patch.
> The main code path for the case being fixed executes through the main code path
> successfully returning zero. The ''--dry-run' was predicitng failure if a script was
> checking the return code, but successs if looking at the messages.
>
> The final couple of paragraphs explain why I chose not to change the if() statement.
> The reason I didn't is so that expected behaviour is maintained.
>
> The condition that can not be removed in the if is the 'whence != FROM_MERGE'. Removing
> that caused t7502 to generate errors. Therefore I left ' if (!commitable && whence != FROM_MERGE
> && !allow_empty && !(amend && is_a_merge(current_head)))' in the commit.c file.
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-02-16 23:39 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
2016-02-16 23:26 ` Stephen & Linda Smith
2016-02-16 23:40 ` Stephen & Linda Smith [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3639645.80CNmLM0I7@thunderbird \
--to=ischis2@cox.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).