diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/patch.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 7ca2e28b1f..7cd8436da5 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -512,7 +512,7 @@ class GitApplyTree(PatchTree): | |||
512 | try: | 512 | try: |
513 | shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot] | 513 | shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot] |
514 | self.gitCommandUserOptions(shellcmd, self.commituser, self.commitemail) | 514 | self.gitCommandUserOptions(shellcmd, self.commituser, self.commitemail) |
515 | shellcmd += ["am", "-3", "--keep-cr", "-p%s" % patch['strippath']] | 515 | shellcmd += ["am", "-3", "--keep-cr", "--no-scissors", "-p%s" % patch['strippath']] |
516 | return _applypatchhelper(shellcmd, patch, force, reverse, run) | 516 | return _applypatchhelper(shellcmd, patch, force, reverse, run) |
517 | except CmdError: | 517 | except CmdError: |
518 | # Need to abort the git am, or we'll still be within it at the end | 518 | # Need to abort the git am, or we'll still be within it at the end |