mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <>
To: Edmundo Carmona Antoranz <>
Cc: Git List <>
Subject: Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
Date: Wed, 17 Jul 2019 11:07:00 -0700	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <> (Edmundo Carmona Antoranz's message of "Sun, 14 Jul 2019 01:15:22 -0600")

Edmundo Carmona Antoranz <> writes:

> On Fri, Jul 12, 2019 at 11:18 PM Edmundo Carmona Antoranz
> <> wrote:
>> Option -m can be used to defined the message for the revision instead
>> of the default message that contains all squashed revisions info.
> I have noticed that just adding the support for -m in squash is more
> complex than this patch is reaching so I think I will break this patch
> into two parts:
> - squash in a shot if there are no conflicts
> - support -m with squash
> Disregard this patch, please.

Sure.  I started skimming and then gave up after seeing that quite a
lot of code has been shuffled around without much explanation (e.g.
printing of "Squash commit -- not updating HEAD" is gone from the
callee and now it is a responsibility of the caller), making it
harder than necessary to see if there is any unintended behaviour
change when the new feature is not in use.  Whatever you are trying,
it does look like the change deserves to be split into a smaller
pieces to become more manageable.


  reply	other threads:[~2019-07-17 18:07 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
2019-07-14  7:15 ` Edmundo Carmona Antoranz
2019-07-17 18:07   ` Junio C Hamano [this message]
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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* 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

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