]> code.ossystems Code Review - openembedded-core.git/commit
lib/oe/patch.py: Prefer "git am" over "git apply" when applying git patches
authorLaszlo Papp <lpapp@kde.org>
Tue, 24 Dec 2013 12:44:10 +0000 (12:44 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 28 Jan 2014 00:48:25 +0000 (00:48 +0000)
commit3a14b0943731822905e6d45b13d08a6e8237e2fe
treeecd88a09e67f35a91d822200f61774423ac34d50
parent0cd58eb1ca29bdc53f623aba1f761b97cfe31fb4
lib/oe/patch.py: Prefer "git am" over "git apply" when applying git patches

It is better to use "git am" when possible to preserve the commit messages and
the mail format in general for patches when those are present. A typical use
case is when developers would like to keep the changes on top of the latest
upstream, and they may occasionally need to rebase. This is not possible with
"git diff" and "diff" generated patches.

Since this is not always the case, the fallback would be the "git apply"
operation which is currently available.

Signed-off-by: Laszlo Papp <lpapp@kde.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/lib/oe/patch.py