On Thu, Aug 20, 2009 at 5:59 PM, Ingmar Vanhassel wrote: > Excerpts from Pau Garcia i Quiles's message of Thu Aug 20 17:30:21 +0200 2009: >> On Thu, Aug 20, 2009 at 12:28 AM, Olivier Goffart wrote: >> > Le Wednesday 19 August 2009, Pau Garcia i Quiles a écrit : >> > >> >> OK, thanks. >> >> >> >> Now that we are talking about kde-qt.git, I have another question: is >> >> there an easy way (i. e. without diff'ing every branch) to get the >> >> patches kde-qt.git has applied? In qt-copy in svn we have the >> >> "patches" directory, which I used to apply to the commercial version >> >> of Qt at work. >> >> Getting those patches from kde-qt.git it much more >> >> difficult, unless there is some way I don't know of. >> > >> > Does this do what you want?: >> > >> > (assuming your HEAD is the 4.5.2-patched branch (the default in kde-qt)) >> > >> > git log -p --no-merges v4.5.2... >> >> It's almost there but there's a small problem: it outputs everything >> in a single patch. That means if some patch is platform-specific (for >> instance, only for Mac), the whole thing would fail. >> >> Having individual patches was very useful because I used to do this to >> apply qt-copy/patches to Qt commercial version: >> >>   svn co svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches patches-qtcopy >>   for I in /c/path/to/patches-qtcopy/*.diff ; do patch -p0 -t < $I; done >> >> By using -t to patch, patches which did not apply were skipped. I >> cannot do that now unless I split the output of "git log -p >> --no-merges v4.5.2" on ^"diff --git" or "commit ". >> >> Is it possible to get the output split as individual patches directly from git ? > > git format-patch --output-directory patches-qtcopy v4.5.2..kde-qt/4.5.2-patched > > Or replace '--output-directory patches-qtcopy' with '--stdout' and pipe > through 'git am' to batch apply them on another git repository. Great, "git format-patch --output-directory patches-qtcopy v4.5.2..4.5.2-patched" works exactly as I'd like Thank you! -- Pau Garcia i Quiles http://www.elpauer.org (Due to my workload, I may need 10 days to answer)