linux-kernel - Signal conflict on merging metadata-differing patches

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

Message-ID: <20191118172917.GA6063@vmlxhi-102.adit-jv.com>
Date:   Mon, 18 Nov 2019 18:29:17 +0100
From:   Eugeniu Rosca <erosca@...adit-jv.com>
To:     <git@...r.kernel.org>
CC:     <linux-kernel@...r.kernel.org>,
        Greg KH <gregkh@...uxfoundation.org>,
        Felipe Balbi <balbi@...nel.org>,
        Eugeniu Rosca <erosca@...adit-jv.com>,
        Eugeniu Rosca <roscaeugeniu@...il.com>
Subject: Signal conflict on merging metadata-differing patches

Dear Git community,

Due to high inflow of patches which Linux maintainers carry on their
shoulders and due to occasionally intricate relationships between
consecutive revisions of the same series, it may [1] happen that two
distinct revisions of the same patch (differing only/mostly in
metadata, e.g. Author's time-stamp and commit description) may end up
being merged on the same branch, without git to complain about that.

Is there any "git merge" flag available off-the-shelf which (if used)
would signal such situations?

[1] https://patchwork.kernel.org/patch/11135107/#23007101

-- 
Best Regards,
Eugeniu