linux-kernel - Re: [GIT PULL] non-MM commits for 6.2-rc1

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] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 12 Dec 2022 15:33:02 -0800
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Andrew Morton <akpm@...ux-foundation.org>
Cc:     "Jason A. Donenfeld" <Jason@...c4.com>, linux-mm@...ck.org,
        mm-commits@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] non-MM commits for 6.2-rc1

On Mon, Dec 12, 2022 at 2:27 PM Andrew Morton <akpm@...ux-foundation.org> wrote:
>
> Is there some way of telling git to complain about identical changes
> when doing a trial merge?

No, the merge functionality of git literally doesn't care about
individual commits.

(git does walk the commit chain as part of finding the common
ancestor, but apart from that, very fundamentally merging in git is
*not* about merging individual commits at any point. None of the darcs
"patch algebra" nonsense).

But as Vlastimil pointed out, git does have various log-based models
for finding identical patches based on the patch ID.

Those are intentionally not used for merging, but for the various
"move patches around" models (cherry-picking and rebasing).

           Linus