Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 14, 2019, 18:59 UTC
Message-ID: <xmqqblxw5tod.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CAOc6etb_XFbQWDHg3YRNiskkntS0ro2MYgXCfp6oPv4LutQFGA@mail.gmail.com>

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.

Show 5 quoted lines

> 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.