From: Don Zickus <dzickus@redhat.com>
Date: Tue, 17 Jun 2008 14:15:19 GMT
Subject: Re: using git-blame with patches as input
Message-ID: <20080617141519.GK16941@redhat.com>
In-Reply-To: <7vej6x9hpk.fsf@gitster.siamese.dyndns.org>

On Mon, Jun 16, 2008 at 02:45:59PM -0700, Junio C Hamano wrote:
> Don Zickus <dzickus@redhat.com> writes:
> 
> > I deal with a lot of backported patches that are a combination of multiple
> > commits.  I was looking to develop a tool that would help me determine
> > which chunks of the patch are upstream (not necessarily currently in HEAD
> > but at some point in the file's history).
> >
> > For example, if I took the top three commits from HEAD and appended them
> > into one patch file and then ran this tool with the patch as input, I
> > would hope that it gave as output the three original commits.
> 
> A quick and dirty hack would be to:
> 
> 	rm .git/index
> 	sed -ne 's/^[+ ]//p' -e '/^@@/p' patches... >file
>         git add file
>         git commit -m 'only "a file" remains'
>         git blame -C -C -w file
> 
> which would try blaming all the postimage concatenated together ;-)

Heh.  Interesting.  I'll try that today.  Thanks.

Cheers,
Don