[Libreoffice] [PUSHED] Cherry pick a commit for fdo 43263

[Lionel Elie Mamane]

On Sat, Nov 26, 2011 at 12:26:16PM -0800, julien2412 wrote:

> As I explained on the comment
> https://bugs.freedesktop.org/show_bug.cgi?id=43263#c1,
> the commit b645f9195f4da3014e001fb27b8a117d89c8f389 could be cherry picked
> on 3.4 branch to fix the crash.

Did that.

> PS : I don't know how to cherry pick but if someone could explain me
> or show me a link, I'd be glad to learn :-)

Normally, with git, it would be pretty easy:

git cherry-pick b645f9195f4da3014e001fb27b8a117d89c8f389

But it is made more complicated by the fact that libreoffice-3-4 and
master are in different git repositories. So I did:

~/src/libreoffice/libreoffice-3.4/clone/filters$ ( cd ~/src/libreoffice/core/; git format-patch --stdout b645f9195f4da3014e001fb27b8a117d89c8f389^1..b645f9195f4da3014e001fb27b8a117d89c8f389 ) | git am -s

Maybe a bit more clear like that:

 cd /libo3-4/clone/FOO
 CHERRYPICK_ID=b645f9195f4da3014e001fb27b8a117d89c8f389
 LIBO_CORE_DIR=~/src/libreoffice/core/
 ( cd  "${LIBO_CORE_DIR}"; git format-patch --stdout ${CHERRYPICK_ID}^1.. ${CHERRYPICK_ID} ) \
   git am -s

-- 
Lionel