From: Elijah Newren <newren@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Sergey Organov <sorganov@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified
Date: Tue, 26 Mar 2019 15:07:42 -0700 [thread overview]
Message-ID: <CABPp-BF7cd2+4jr=zGVP8x_QLdFbyOoGRWUgMtgiGDCdqZdjFA@mail.gmail.com> (raw)
In-Reply-To: <20190326163204.GC29627@sigill.intra.peff.net>
On Tue, Mar 26, 2019 at 9:35 AM Jeff King <peff@peff.net> wrote:
>
> On Mon, Mar 25, 2019 at 09:43:09AM +0300, Sergey Organov wrote:
>
> > How about changing "git show -p M" to output "diff -p M^ M" rather than
> > "diff-tree --cc M" for merge commits? It's really surprising specifying
> > -p has no visible effect.
>
> That's because "-p" is already the default, and the format selection is
> orthogonal to the handling of merge commits. Providing "-m" would
> actually override the "--cc" default (though "--first-parent -m" is
> likely to be less noisy, per this discussion).
>
> As far as defaults go, I dunno. The idea is that "--cc" would give you a
> nice summary of what the merge _itself_ had to touch. I think that's
> valuable, too. If we were starting from scratch, I think there could be
> a discussion about whether one default is better than the other. But at
> this point I have a hard time finding one so much obviously better than
> the other to merit changing the behavior.
Indeed, some of us would view a first parent diff default for merges
as problematic. However, I'd like to point out (or remind) that these
two options aren't the only ways you could view a merge. Thomas
Rast's --remerge-diff[1] is another (even if not yet part of git.git).
Gerrit uses something similar-ish for its default way of showing a
merge.
[1] See e.g. https://bugs.chromium.org/p/git/issues/detail?id=12
next prev parent reply other threads:[~2019-03-26 22:07 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-25 12:42 [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified Sergey Organov
2018-06-21 15:54 ` Junio C Hamano
2018-06-22 9:16 ` Sergey Organov
2018-12-12 5:35 ` Sergey Organov
2018-12-13 4:20 ` Junio C Hamano
2018-12-13 6:35 ` Sergey Organov
2018-12-13 15:35 ` Sergey Organov
2018-12-14 2:36 ` Junio C Hamano
2018-12-14 4:39 ` [PATCH v2 0/4] Allow 'cherry-pick -m 1' for non-merge commits Sergey Organov
2018-12-14 4:53 ` [PATCH v2 3/4] t3502: validate '-m 1' argument is now accepted " Sergey Organov
2019-01-03 17:22 ` SZEDER Gábor
2019-01-06 14:41 ` Sergey Organov
2018-12-14 4:53 ` [PATCH v2 2/4] cherry-pick: do not error on non-merge commits when '-m 1' is specified Sergey Organov
2018-12-14 4:53 ` [PATCH v2 1/4] t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks Sergey Organov
2018-12-14 4:53 ` [PATCH v2 4/4] t3506: validate '-m 1 -ff' is now accepted for non-merge commits Sergey Organov
2018-12-25 12:39 ` [PATCH v2 0/4] Allow 'cherry-pick -m 1' " Sergey Organov, Sergey Organov
2018-12-26 22:52 ` Junio C Hamano
2018-12-29 9:10 ` Sergey Organov
2018-12-14 4:39 ` [PATCH v3 " Sergey Organov
2018-12-14 4:53 ` [PATCH v3 1/4] t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks Sergey Organov
2018-12-14 4:53 ` [PATCH v3 3/4] t3502: validate '-m 1' argument is now accepted for non-merge commits Sergey Organov
2018-12-14 4:53 ` [PATCH v3 4/4] t3506: validate '-m 1 -ff' " Sergey Organov
2018-12-14 4:53 ` [PATCH v3 2/4] cherry-pick: do not error on non-merge commits when '-m 1' is specified Sergey Organov
2019-03-19 11:29 ` [PATCH] " Sergey Organov
2019-03-20 0:38 ` Junio C Hamano
2019-03-20 5:09 ` Jeff King
2019-03-25 6:43 ` Sergey Organov
2019-03-26 16:32 ` Jeff King
2019-03-26 22:07 ` Elijah Newren [this message]
2019-03-26 22:20 ` Jeff King
2019-03-27 0:33 ` Elijah Newren
2019-03-27 13:54 ` Sergey Organov
-- strict thread matches above, loose matches on Subject: below --
2018-05-25 12:42 Sergey Organov
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='CABPp-BF7cd2+4jr=zGVP8x_QLdFbyOoGRWUgMtgiGDCdqZdjFA@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sorganov@gmail.com \
/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).