linux-kernel - Re: [GIT PULL] HID for 6.11

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <6adde20b-2345-49dd-8502-c2a68c8f1c1e@intel.com>
Date: Tue, 6 Aug 2024 15:04:00 -0700
From: Jacob Keller <jacob.e.keller@...el.com>
To: Benjamin Tissoires <bentiss@...nel.org>, Krzysztof Kozlowski
	<krzk@...nel.org>
CC: Konrad Dybcio <konrad.dybcio@...aro.org>, Linus Torvalds
	<torvalds@...ux-foundation.org>, Jiri Kosina <jikos@...nel.org>,
	<linux-kernel@...r.kernel.org>, Konstantin Ryabitsev
	<konstantin@...uxfoundation.org>
Subject: Re: [GIT PULL] HID for 6.11

On 7/22/2024 6:51 AM, Benjamin Tissoires wrote:
> Is there anything we can do to rip off that commit from the tree and fix
> b4?
> 
> 
A bit late, but I just got bit by this comment and i worked around it
using a replace ref:

$ git replace --edit 3a904d2c771115154380caaae7ffaaf0095fb88f

This let me generate a replacement commit with an edited commit message
so that b4 scanning for a commit won't find this particular b4 meta-data.

It is only local (as refs/replace does not generally get shared to
others via normal push/pull) but it worked well for me.

I thought I would share this with other folks as a potential workaround
for their setup. replace refs are special refs which git will
automatically use in place of a regular commit when it finds a matching ref.

https://git-scm.com/docs/git-replace

Thanks,
Jake