From: Eugeniu Rosca <erosca@de.adit-jv.com>
To: <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð" <avarab@gmail.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Eugeniu Rosca" <erosca@de.adit-jv.com>,
"Eugeniu Rosca" <roscaeugeniu@gmail.com>
Subject: Assessing about commit order in upstream Linux
Date: Tue, 26 May 2020 08:53:20 +0200 [thread overview]
Message-ID: <20200526065320.GA18107@lxhi-065.adit-jv.com> (raw)
Dear Git community,
Assessing about the correct order of upstream commits is essential
during the backporting process, since we aim to ensure that the
backporting result can be built and bisected at each commit.
However, there appear to be at least two ways to compute the
relative order of "mainline" commits, specifically based on the:
* index/position of commit summary line in the output of
'git log --oneline --topo-order upstream/master'
* 'git describe --contains --match="v*" <SHA1>' of each commit
I've considered both approaches equivalent, until I ran into [A-B].
Judging by the index in the 'git log' output, commit [B] seems to
(topologically) come first and hence would need to be backported first:
$ git log --reverse --oneline --topo-order v4.14..v4.15 | grep -n "mm: slabinfo: remove CONFIG_SLABINFO" | cut -f1 -d:
7261
$ git log --reverse --oneline --topo-order v4.14..v4.15 | grep -n "RDMA/umem: Avoid partial declaration of non-static function" | cut -f1 -d:
7029
Judging by the version returned by 'git describe --contains', commit [A]
seems to (topologically) come first due to '~93' putting it (mentally)
"earlier" in the topological graph compared to '~73':
$ git describe --contains --match="v*" 5b36577109be
v4.15-rc1~93^2~117
$ git describe --contains --match="v*" fec99ededf6b
v4.15-rc1~73^2~56
So, the two approaches lead to different results. If you see any false
assumption or mistaken belief, could you please pinpoint that? TIA.
[A] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5b36577109be
("mm: slabinfo: remove CONFIG_SLABINFO")
[B] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fec99ededf6b
("RDMA/umem: Avoid partial declaration of non-static function")
--
Best regards,
Eugeniu Rosca
next reply other threads:[~2020-05-26 6:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 6:53 Eugeniu Rosca [this message]
2020-05-26 15:21 ` Assessing about commit order in upstream Linux Junio C Hamano
2020-05-26 17:14 ` Michal Suchánek
2020-05-28 18:12 ` Eugeniu Rosca
2020-05-28 20:25 ` Michal Suchánek
2020-05-28 17:59 ` Eugeniu Rosca
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=20200526065320.GA18107@lxhi-065.adit-jv.com \
--to=erosca@de.adit-jv.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=roscaeugeniu@gmail.com \
--cc=szeder.dev@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).