From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Mon, 25 Jul 2011 08:08:10 +0000 (+0100)
Subject: scripts/combo-layer: keep carriage returns at the end of lines
X-Git-Tag: 2011-1~594
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=bab4952075245563787293428e031fa11d6cb2b4;p=openembedded-core.git

scripts/combo-layer: keep carriage returns at the end of lines

Use --keep-cr option to "git am" or otherwise we lose carriage returns
which can be important for patches against files that use CRs.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 84cc48f6ff..d1291751fa 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -254,7 +254,7 @@ def action_apply_patch(conf, args):
         for line in open(repo['patchlist']):
             patchfile = line.split()[0]
             lastrev = line.split()[1]
-            cmd = "git am -s -p1 %s" % patchfile
+            cmd = "git am --keep-cr -s -p1 %s" % patchfile
             logger.info("Apply %s" % patchfile )
             try:
                 runcmd(cmd)