Fyi patch submission information on wiki updated for GitHub
Misha Koshelev
misha680 at gmail.com
Tue Jul 20 07:47:16 CDT 2010
On Mon, 2010-07-19 at 22:48 -0600, Vitaliy Margolen wrote:
> On 07/19/2010 08:59 PM, Misha Koshelev wrote:
> > Unfortunately, the more intuitive
> > git format-patch -k --stdout HEAD~79..HEAD~78> /tmp/patch.old
> >
> > does not seem to result in patches that can be properly applied onto a
> > different (upstream) remote (see below).
>
> Works fine here. You must have had some additional changes between upstream
> and HEAD~79. Or your tree diverged from the origin (you had some of your
> patches merged and not rebased) which is the same as above.
Just to double check, I have the following layout:
origin git at github.com:misha680/wine.git (fetch)
origin git at github.com:misha680/wine.git (push)
upstream http://github.com/mirrors/wine.git (fetch)
upstream http://github.com/mirrors/wine.git (push)
wine-git git://source.winehq.org/git/wine.git (fetch)
wine-git git://source.winehq.org/git/wine.git (push)
And the following patches:
misha at misha-d630:~/src/wine-d3dx9$ git log wine-git/master | head -n 5
commit 15c6057ce1454004ac8120fc079ef581fa0efb9c
Author: Andrew Nguyen <anguyen at codeweavers.com>
Date: Sun Jul 18 19:35:43 2010 -0500
shlwapi: Implement StrStrNIW.
misha at misha-d630:~/src/wine-d3dx9$ git log HEAD~79 | head -n 15
commit 8e7a26b5926c9246d7d33930ccffd27c8fb66cfe
Author: Misha Koshelev <misha680 at gmail.com>
Date: Wed Jul 7 09:59:52 2010 -0500
d3dx9: Test number of vertices for D3DXCreateSphere, retrieve vertex
buffer.
commit 15c6057ce1454004ac8120fc079ef581fa0efb9c
Author: Andrew Nguyen <anguyen at codeweavers.com>
Date: Sun Jul 18 19:35:43 2010 -0500
shlwapi: Implement StrStrNIW.
Is there a better command to use? (fyi my upstream is called wine-git as
per reference in my previous post and what I had added on wiki yesterday
- I actually have it point to wine git rather than GitHub mirror).
>
> And you should really be using "--attach". It's always the better option,
> especially for the series of patches.
Duly noted.
>
> Vitaliy
Misha
More information about the wine-devel
mailing list