Re: [cdt-dev] git patch files

[John Cortell <rat042@xxxxxxxxxxxxx>]

At 03:51 AM 8/16/2011, James Blackburn wrote:

On 15 August 2011 23:13, John Cortell <rat042@xxxxxxxxxxxxx> wrote:

At 05:07 PM 8/15/2011, Andrew Gvozdev wrote:

OK, that is the new commit. What about 98fa6c5..30760cf, this one is not in CDT repo either?

That's not a commit. That's some sort of index hash.

It's actually two blobs.  Blobs are a core datatype in git: commits point to trees which point to blobs: http://eagain.net/articles/git-for-computer-scientists/

For each file in the diff, git is emitting the diff that corresponds to the change produced by diffing the two blobs.  If the parent commits (& by proxy blobs) aren't in the central CDT repository then applying the patch will fail.

When you create the patch in egit the patch is against the commit's parent. Perhaps this is where the issue lies.   You either need to ensure that the commit's parent is part of the upstream CDT repository, or egit should support creating a patch against an arbitrary commit (like git diff does).

I've created a bug:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=354800

Thanks for solving the mystery and opening the bug. In light of that,
I'll remove the link to the screencast for creating CDT patches since it
seems that approach doesn't produce something a committer can apply, and
that is specifically what the screencast is trying to help people
produce.

John