From: Luis Chamberlain <mcgrof@kernel.org>
To: Chuck Lever III <chuck.lever@oracle.com>
Cc: Daniel Gomez <da.gomez@kruces.com>,
"cel@kernel.org" <cel@kernel.org>,
Daniel Gomez <da.gomez@kernel.org>,
"kdevops@lists.linux.dev" <kdevops@lists.linux.dev>
Subject: Re: [PATCH] kconfig: "output yaml" renders boolean N as a comment
Date: Thu, 17 Apr 2025 20:03:57 -0700 [thread overview]
Message-ID: <aAHBHTNiUYGCXOON@bombadil.infradead.org> (raw)
In-Reply-To: <1F522960-C622-4E23-8D74-5F34F32DEAFC@oracle.com>
On Fri, Apr 18, 2025 at 01:13:05AM +0000, Chuck Lever III wrote:
>
>
> After pushing the patch to kconfig / yamlconfig, I tried using
> the Makefile.subtrees targets to merge that commit into
> kdevops / main, and got this:
>
> cel@renoir:/tmp/kdevops$ make -f Makefile.subtrees refresh-subtrees
> fatal: refusing to merge unrelated histories
So.. basically when I removed the old results archive to get the kdevops
tree to go on a diet (first patch in the tree now) I git added
*everyhing* back... and I forgot to add instead kconfig as a git subtree
then. So that messed up the history. There however is a trick which can
be adopted for very obscure ways to use git subtrees when this happens,
essentially we tell git -- don't worry, trust me.
The git ocult trick is documented under kdevops git commit ec5a7d94a3b99e5
("Split 'scripts/kconfig/' into commit 'd2ca2620d14b94bc94e9e0d9adc7a3d030ae13c7'".
Its why I documented carefully there as there is no man pages about this
fun way to use git subtrees this way. In fact I don't think the authors
intended for this to work, but it does.
Luis
next prev parent reply other threads:[~2025-04-18 3:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-17 15:13 [PATCH] kconfig: "output yaml" renders boolean N as a comment cel
[not found] ` <CABj0suCM=dE8hLHoxZDo+isX5qNZAumF4OCdGqsSVAtoO1DTCw@mail.gmail.com>
[not found] ` <1F522960-C622-4E23-8D74-5F34F32DEAFC@oracle.com>
2025-04-18 3:03 ` Luis Chamberlain [this message]
2025-04-18 14:18 ` Chuck Lever
2025-04-18 18:15 ` Chuck Lever
2025-04-18 19:12 ` Luis Chamberlain
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=aAHBHTNiUYGCXOON@bombadil.infradead.org \
--to=mcgrof@kernel.org \
--cc=cel@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=da.gomez@kernel.org \
--cc=da.gomez@kruces.com \
--cc=kdevops@lists.linux.dev \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox