From: Elijah Newren <newren@gmail.com>
To: Bagas Sanjaya <bagasdotme@gmail.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Jonathan Nieder <jrnieder@gmail.com>,
Sergey Organov <sorganov@gmail.com>
Subject: Re: [PATCH 0/7] Add a new --remerge-diff capability to show & log
Date: Tue, 31 Aug 2021 09:16:07 -0700 [thread overview]
Message-ID: <CABPp-BGYoa9yfSEv5-XNbUqTrpgKjdNaYsPNSujNuEBfT88=FQ@mail.gmail.com> (raw)
In-Reply-To: <665c48f7-b597-154f-6ac7-8d0471f14869@gmail.com>
On Tue, Aug 31, 2021 at 4:05 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
>
> On 31/08/21 09.26, Elijah Newren via GitGitGadget wrote:
> > Here are some patches to add a --remerge-diff capability to show & log,
> > which works by comparing merge commits to an automatic remerge (note that
> > the automatic remerge tree can contain files with conflict markers).
> >
> > Here are some example commits you can try this out on (with git show
> > --remerge-diff $COMMIT):
> >
> > * git.git conflicted merge: 07601b5b36
> > * git.git non-conflicted change: bf04590ecd
> > * linux.git conflicted merge: eab3540562fb
> > * linux.git non-conflicted change: 223cea6a4f05
> >
> <snip>...
> > In regards to the performance point above, the timing for running the
> > following command:
> >
> > time git log --min-parents=2 --max-parents=2 $DIFF_FLAG | wc -l
> >
> >
> > in linux.git (with v5.4 checked out, since my copy of linux is very out of
> > date) is as follows:
> >
> > DIFF_FLAG=--cc: 71m 31.536s
> > DIFF_FLAG=--remerge-diff: 31m 3.170s
> >
> >
> > Note that there are 62476 merges in this history. Also, output size is:
> >
> > DIFF_FLAG=--cc: 2169111 lines
> > DIFF_FLAG=--remerge-diff: 2458020 lines
> >
>
> Which repo did you mean by linux.git? Kernel developers often work
> against Linus' mainline tree [1], while end-users (including myself)
> prefer stable tree (which is mainline + stable release branches and
> tags) [2].
>
> [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
> [2]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
$ git remote -v
origin git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
(fetch)
origin git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
(push)
$ git log -1 origin/master
commit 11a48a5a18c63fd7621bb050228cebf13566e4d8 (tag: v5.6-rc2,
origin/master, origin/HEAD, master)
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun Feb 16 13:16:59 2020 -0800
Linux 5.6-rc2
$ git log -1 HEAD
commit 219d54332a09e8d8741c1e1982f5eae56099de85 (HEAD, tag: v5.4)
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun Nov 24 16:32:01 2019 -0800
Linux 5.4
next prev parent reply other threads:[~2021-08-31 16:16 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 2:26 [PATCH 0/7] Add a new --remerge-diff capability to show & log Elijah Newren via GitGitGadget
2021-08-31 2:26 ` [PATCH 1/7] merge-ort: mark a few more conflict messages as omittable Elijah Newren via GitGitGadget
2021-08-31 21:06 ` Junio C Hamano
2021-09-01 0:03 ` Elijah Newren
2021-09-01 17:19 ` Junio C Hamano
2021-08-31 2:26 ` [PATCH 2/7] merge-ort: add ability to record conflict messages in a file Elijah Newren via GitGitGadget
2021-09-28 22:29 ` Jeff King
2021-09-29 6:25 ` Elijah Newren
2021-09-29 16:14 ` Junio C Hamano
2021-09-29 16:31 ` Elijah Newren
2021-09-30 7:58 ` Jeff King
2021-09-30 8:09 ` Ævar Arnfjörð Bjarmason
2021-10-01 2:07 ` Elijah Newren
2021-10-01 5:28 ` Jeff King
2021-08-31 2:26 ` [PATCH 3/7] ll-merge: add API for capturing warnings in a strbuf instead of stderr Elijah Newren via GitGitGadget
2021-09-28 22:37 ` Jeff King
2021-09-28 23:49 ` Junio C Hamano
2021-09-29 4:03 ` Elijah Newren
2021-08-31 2:26 ` [PATCH 4/7] merge-ort: capture and print ll-merge warnings in our preferred fashion Elijah Newren via GitGitGadget
2021-09-28 22:39 ` Jeff King
2021-09-30 16:53 ` Ævar Arnfjörð Bjarmason
2021-10-01 1:54 ` Elijah Newren
2021-10-01 7:23 ` Ævar Arnfjörð Bjarmason
2021-08-31 2:26 ` [PATCH 5/7] tmp-objdir: new API for creating and removing primary object dirs Elijah Newren via GitGitGadget
2021-09-28 7:55 ` Ævar Arnfjörð Bjarmason
2021-09-29 4:22 ` Elijah Newren
2021-09-30 7:41 ` Jeff King
2021-09-30 14:17 ` Ævar Arnfjörð Bjarmason
2021-10-01 3:55 ` Elijah Newren
2021-09-28 23:17 ` Jeff King
2021-09-29 4:08 ` Junio C Hamano
2021-09-30 7:33 ` Jeff King
2021-09-30 13:16 ` Ævar Arnfjörð Bjarmason
2021-09-30 21:00 ` Jeff King
2021-10-01 3:11 ` Elijah Newren
2021-10-01 7:30 ` Ævar Arnfjörð Bjarmason
2021-10-01 8:03 ` Elijah Newren
2021-10-01 4:26 ` Elijah Newren
2021-10-01 5:27 ` Jeff King
2021-10-01 7:43 ` Ævar Arnfjörð Bjarmason
2021-09-29 5:05 ` Elijah Newren
2021-09-30 7:26 ` Jeff King
2021-09-30 7:46 ` Jeff King
2021-09-30 20:06 ` Junio C Hamano
2021-10-01 3:59 ` Elijah Newren
2021-10-01 16:36 ` Junio C Hamano
2021-10-01 2:31 ` Elijah Newren
2021-10-01 5:21 ` Jeff King
2021-09-30 19:25 ` Neeraj Singh
2021-09-30 20:19 ` Junio C Hamano
2021-09-30 20:00 ` Junio C Hamano
2021-10-01 2:23 ` Elijah Newren
2021-08-31 2:26 ` [PATCH 6/7] show, log: provide a --remerge-diff capability Elijah Newren via GitGitGadget
2021-08-31 9:19 ` Sergey Organov
2021-09-28 8:01 ` Ævar Arnfjörð Bjarmason
2021-09-29 4:00 ` Elijah Newren
2021-08-31 2:26 ` [PATCH 7/7] doc/diff-options: explain the new --remerge-diff option Elijah Newren via GitGitGadget
2021-08-31 11:05 ` [PATCH 0/7] Add a new --remerge-diff capability to show & log Bagas Sanjaya
2021-08-31 16:16 ` Elijah Newren [this message]
2021-08-31 20:03 ` Junio C Hamano
2021-08-31 20:23 ` Elijah Newren
2021-09-01 21:07 ` Junio C Hamano
2021-09-01 21:42 ` Elijah Newren
2021-09-01 21:55 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABPp-BGYoa9yfSEv5-XNbUqTrpgKjdNaYsPNSujNuEBfT88=FQ@mail.gmail.com' \
--to=newren@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jrnieder@gmail.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.