Re: [RFC] Importing from a patch-oriented SCM

From: Junio C Hamano <junkio@cox.net>
Date: Aug 19, 2005, 07:49 UTC
Message-ID: <7vslx61i3s.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <46a038f9050819000417ed436e@mail.gmail.com>

Martin Langhoff <martin.langhoff@gmail.com> writes:

> If I remember correctly, Junio added some stuff in the merge & rebase
> code that will identify if a particular patch has been seen and
> applied, and skip it even if it's a bit out of order. But I don't know

I think you are talking about git-patch-id.

f97672225b3b1a2ca57cfc16f49239bed1efcd87
Author: Linus Torvalds <torvalds@ppc970.osdl.org>
Date:   Thu Jun 23 15:06:04 2005 -0700

    Add "git-patch-id" program to generate patch ID's.

    A "patch ID" is nothing but a SHA1 of the diff associated
    with a patch, with whitespace and line numbers ignored.  As
    such, it's "reasonably stable", but at the same time also
    reasonably unique, ie two patches that have the same "patch
    ID" are almost guaranteed to be the same thing.

    IOW, you can use this thing to look for likely duplicate
    commits.