From ee3304b8b089eb816a1c9b1cd2db5544b27e0947 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 25 Jul 2011 09:08:10 +0100 Subject: 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. (From OE-Core rev: bab4952075245563787293428e031fa11d6cb2b4) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') 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) -- cgit v1.1