From 1cfcae0cd0bc776f5bb91a75bb8ffdad3d7bf200 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 19 Dec 2014 11:41:47 +0000 Subject: lib/oe/patch: use --keep-cr with git am Preserving carriage returns is important where the patch contains them. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/patch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 2d56ba404e..2bf30651eb 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -287,7 +287,7 @@ class GitApplyTree(PatchTree): return runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) try: - shellcmd = ["git", "--work-tree=.", "am", "-3", "-p%s" % patch['strippath']] + shellcmd = ["git", "--work-tree=.", "am", "-3", "--keep-cr", "-p%s" % patch['strippath']] return _applypatchhelper(shellcmd, patch, force, reverse, run) except CmdError: # Fall back to git apply -- cgit 1.2.3-korg