From 13ea33fbd197b9ee3cf913d9995617115f22798f Mon Sep 17 00:00:00 2001 From: Tomasz Dziendzielski Date: Sun, 31 Jan 2021 11:46:49 +0100 Subject: lib/oe/patch.py: Ignore scissors line on applying patch The "devtool modify" could remove message body before scissors line, so patches re-generated from git tree were incorrectly modified. Adding --no-scissors to "git am" invocation to prevent this behaviour. [YOCTO #12674] Signed-off-by: Tomasz Dziendzielski 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 8ad70f53f1..fccbedb519 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -516,7 +516,7 @@ class GitApplyTree(PatchTree): try: shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot] self.gitCommandUserOptions(shellcmd, self.commituser, self.commitemail) - shellcmd += ["am", "-3", "--keep-cr", "-p%s" % patch['strippath']] + shellcmd += ["am", "-3", "--keep-cr", "--no-scissors", "-p%s" % patch['strippath']] return _applypatchhelper(shellcmd, patch, force, reverse, run) except CmdError: # Need to abort the git am, or we'll still be within it at the end -- cgit 1.2.3-korg