From: Edmundo Carmona Antoranz <eantoranz@gmail.com>
To: Git List <git@vger.kernel.org>
Subject: Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
Date: Fri, 12 Jul 2019 23:27:06 -0600 [thread overview]
Message-ID: <CAOc6etb_XFbQWDHg3YRNiskkntS0ro2MYgXCfp6oPv4LutQFGA@mail.gmail.com> (raw)
In-Reply-To: <20190713051804.12893-1-eantoranz@gmail.com>
On Fri, Jul 12, 2019 at 11:18 PM Edmundo Carmona Antoranz
<eantoranz@gmail.com> wrote:
> @@ -1342,18 +1354,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
> if (verbosity < 0)
> show_diffstat = 0;
>
> - if (squash) {
> - if (fast_forward == FF_NO)
> - die(_("You cannot combine --squash with --no-ff."));
> - if (option_commit > 0)
> - die(_("You cannot combine --squash with --commit."));
> - /*
> - * squash can now silently disable option_commit - this is not
> - * a problem as it is only overriding the default, not a user
> - * supplied option.
> - */
> - option_commit = 0;
> - }
> + if (squash && fast_forward == FF_NO)
> + die(_("You cannot combine --squash with --no-ff."));
>
> if (option_commit < 0)
> option_commit = 1;
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. 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.").
next prev parent reply other threads:[~2019-07-13 5:27 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 [this message]
2019-07-14 18:59 ` Junio C Hamano
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=CAOc6etb_XFbQWDHg3YRNiskkntS0ro2MYgXCfp6oPv4LutQFGA@mail.gmail.com \
--to=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).