From: Elijah Newren <firstname.lastname@example.org> To: Jeff King <email@example.com> Cc: Sergey Organov <firstname.lastname@example.org>, Junio C Hamano <email@example.com>, Git Mailing List <firstname.lastname@example.org> Subject: Re: [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified Date: Tue, 26 Mar 2019 17:33:47 -0700 [thread overview] Message-ID: <CABPp-BGoH3qE0VqMyov-3YTSFSgDBy6xTKKgrckabnAt2pz05A@mail.gmail.com> (raw) In-Reply-To: <20190326222052.GD1445@sigill.intra.peff.net> On Tue, Mar 26, 2019 at 3:20 PM Jeff King <email@example.com> wrote: > > On Tue, Mar 26, 2019 at 03:07:42PM -0700, Elijah Newren wrote: > > > On Tue, Mar 26, 2019 at 9:35 AM Jeff King <firstname.lastname@example.org> 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 is another (even if not yet part of git.git). > > Gerrit uses something similar-ish for its default way of showing a > > merge. > > Heh, I almost mentioned remerge-diff, but since it's not actually part > of Git, I didn't want to get into a tangent. But since you mention it, > yes, I actually find it quite a useful way of looking at the diff, > especially when I want to see what the person resolving the conflicts > actually _did_. The --cc combined diff is too eager to throw away hunks > that resolved purely to one side (which _most_ of the time is what you > want, but when you're hunting a possible error in the merge, it's quite > confusing). > > How close is merge-recursive.c to actually doing a pure in-memory merge? > > I seem to recall that was a (the?) sticking point for the original > remerge-diff. Doing a pure in-memory merge is tied up with my overall merge-recursive rewrite, but I haven't touched merge stuff in quite a while now other than the recent make-directory-rename-detection-be-a-conflict-by-default stuff. I'm hoping I can finish that soon (though I've struggled a bit to find the time to do so), and finish out the filter-repo stuff, then I plan to get back to merge stuff again. A pure in-memory merge is near the top of my priorities for the rewrite, so we'll get it...eventually. (Maybe a Christmas present?) I do think there's more than just that sticking point for the remerge-diff, but the other things are on my radar too (a few slots later on my todo list).
next prev parent reply other threads:[~2019-03-27 0:34 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 1/4] t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks 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 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 3/4] t3502: validate '-m 1' argument " 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 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 2019-03-26 22:20 ` Jeff King 2019-03-27 0:33 ` Elijah Newren [this message] 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-BGoH3qE0VqMyov-3YTSFSgDBy6xTKKgrckabnAt2pz05A@mail.gmail.com \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --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
firstname.lastname@example.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ email@example.com public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.version-control.git nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.version-control.git nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git