Skip to content
Commit 22b0bd5a authored by Tomasz Dziendzielski's avatar Tomasz Dziendzielski Committed by Steve Sakoman
Browse files

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: default avatarTomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
Signed-off-by: default avatarRichard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 13ea33fb)
Signed-off-by: default avatarSteve Sakoman <steve@sakoman.com>
parent 0ab58355
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment