Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Paul Eggleton <paul.eggleton@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/2] scripts/combo-layer: keep carriage returns at the end of lines
Date: Mon, 25 Jul 2011 15:44:48 +0100	[thread overview]
Message-ID: <d1842fa04d3ce36a585e2c0b26ee5d8104f5ec0c.1311605016.git.paul.eggleton@linux.intel.com> (raw)
In-Reply-To: <cover.1311605016.git.paul.eggleton@linux.intel.com>
In-Reply-To: <cover.1311605016.git.paul.eggleton@linux.intel.com>

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>
---
 scripts/combo-layer |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 84cc48f..d129175 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)
-- 
1.7.4.1




  parent reply	other threads:[~2011-07-25 14:49 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-25 14:44 [PATCH 0/2] Couple of fixes Paul Eggleton
2011-07-25 14:44 ` [PATCH 1/2] eglibc: remove unnecessary FILESPATHPKG usage Paul Eggleton
2011-07-25 14:44 ` Paul Eggleton [this message]
2011-07-28  0:05 ` [PATCH 0/2] Couple of fixes Saul Wold

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d1842fa04d3ce36a585e2c0b26ee5d8104f5ec0c.1311605016.git.paul.eggleton@linux.intel.com \
    --to=paul.eggleton@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox