]> code.ossystems Code Review - openembedded-core.git/commit
scripts/combo-layer: handle diffs in commit messages
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Thu, 22 Mar 2012 17:15:05 +0000 (17:15 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 23 Mar 2012 12:07:25 +0000 (12:07 +0000)
commit6e70c95dc69be6708c3bc231cc2a99eac1360815
tree063f22587d4942d32a317462a2ffe654c9845093
parentb03e710c88ad0c66cf731647f26e8441d0074cae
scripts/combo-layer: handle diffs in commit messages

A few recent commits in the OE-Core repository contain diffs in their
commit messages, which totally confuses git-am when applying them to the
combo repository during update. Add some code to detect and indent any
diff text in the commit message so that this does not happen (and show a
warning).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/combo-layer