From: Sergey Organov <firstname.lastname@example.org> To: Junio C Hamano <email@example.com> Cc: firstname.lastname@example.org Subject: Re: [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified Date: Mon, 25 Mar 2019 09:43:09 +0300 [thread overview] Message-ID: <email@example.com> (raw) In-Reply-To: <firstname.lastname@example.org> (Junio C. Hamano's message of "Wed, 20 Mar 2019 09:38:57 +0900") Junio C Hamano <email@example.com> writes: > Sergey Organov <firstname.lastname@example.org> writes: > >> I think that "first-parent is special" is the way to go indeed for >> porcelain, as it does make many thing easier and more convenient[*]. > > Perhaps. However ... > >> [*] One example that immediately comes to mind is "git log -p" for a >> merge commit. I doesn't currently (as of v2.10) show the first-parent >> diff, for whatever reason. "git log -p -m --first-parent" is needed to >> get the answer to most "obvious" question: what (merge) commit did to my >> mainline? "git show" has its own issues. > > ... this is very much deliberate and will remain so. > A single ball of wax "diff M^ M" for a merge commit is not always > what you would want, especially while viewing "git log -p" (without > "--first-parent"). OK, point taken. Then it's an issue of suppressing (presumably huge) parts of output for merge commits by default, and is only vaguely relevant to the "first parent is special" trend that I intended to discuss. So, let's leave in peace the "git log -p" for now, and let me try it from different angle. 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. Also, is current output of "git log -m", being extremely confusing, suitable for anything? Maybe consider to change it to output diff with respect to the first parent only? Though it's then a pity "-m" lacks argument here, similar to what it has in cherry-pick. -- Sergey
next prev parent reply other threads:[~2019-03-25 6:43 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-25 12:42 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 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-14 4:53 ` [PATCH v2 3/4] t3502: validate '-m 1' argument " Sergey Organov 2019-01-03 17:22 ` SZEDER Gábor 2019-01-06 14:41 ` 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 4/4] t3506: validate '-m 1 -ff' is now accepted " 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 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 1/4] t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks Sergey Organov 2019-03-19 11:29 ` [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified Sergey Organov 2019-03-20 0:38 ` Junio C Hamano 2019-03-20 5:09 ` Jeff King 2019-03-25 6:43 ` Sergey Organov [this message] 2019-03-26 16:32 ` Jeff King 2019-03-26 22:07 ` Elijah Newren 2019-03-26 22:20 ` Jeff King 2019-03-27 0:33 ` Elijah Newren 2019-03-27 13:54 ` Sergey Organov 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 \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --subject='Re: [PATCH] cherry-pick: do not error on non-merge commits when '\''-m 1'\'' is specified' \ /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
Code repositories for project(s) associated with this 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).