From: Junio C Hamano <gitster@pobox.com>
To: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
Date: Sun, 14 Jul 2019 11:59:14 -0700 [thread overview]
Message-ID: <xmqqblxw5tod.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CAOc6etb_XFbQWDHg3YRNiskkntS0ro2MYgXCfp6oPv4LutQFGA@mail.gmail.com> (Edmundo Carmona Antoranz's message of "Fri, 12 Jul 2019 23:27:06 -0600")
Edmundo Carmona Antoranz <eantoranz@gmail.com> writes:
> One question that I have is if it makes sense to set option_commit
> to 0 if the user didn't specify --commit when using --squash, so
> that the current behavior of git is not broken.
If you mean that "git merge --squash <other args but not
--[no-]commit>" should behave identically with or without your
patch, then I think the answer is definitely yes.
> Like you run merge --squash, git will stop as it currently
> does... but it would be possible to run with --squash --commit so
> that the revision is created if there are no issues to take care
> of (currently impossible, you would see that message saying "You
> cannot combine --squash with --commit.").
That is exactly a safe way to extend the system by adding a new mode
of operation in a backward compatible fashion. Good thinking.
next prev parent reply other threads:[~2019-07-14 18:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-13 5:18 [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts Edmundo Carmona Antoranz
2019-07-13 5:27 ` Edmundo Carmona Antoranz
2019-07-14 18:59 ` Junio C Hamano [this message]
2019-07-14 7:15 ` Edmundo Carmona Antoranz
2019-07-17 18:07 ` Junio C Hamano
2019-07-18 0:41 ` Edmundo Carmona Antoranz
2019-07-18 2:32 ` Edmundo Carmona Antoranz
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=xmqqblxw5tod.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=eantoranz@gmail.com \
--cc=git@vger.kernel.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).