]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit - meta/lib/oe/patch.py
lib/oe/patch: handle patches that delete files with older git
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Fri, 28 Aug 2015 09:13:20 +0000 (10:13 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 30 Aug 2015 11:34:22 +0000 (12:34 +0100)
commit367ffba394bb815d776f48a367d5d7e5ea9b3bba
tree845efb560894963bdfd86b67b3ec48d3c03aa52b
parent9585cffea33895c3ceea30f45325d2eca6dcf1c2
lib/oe/patch: handle patches that delete files with older git

When running "git add" on a directory with older git versions, deleted
files aren't added to what is to be committed unless you explicitly
specify the -A option. The result of this is that when applying a patch
from a recipe which doesn't apply with "git am" (and we fall back to
applying the patch through other means then "git add" following by
a "git commit") these deletes weren't committed with the patch, leaving
them sitting deleted but not committed at the end.

This should fix test_devtool_modify_native (which unwittingly exercises
this scenario by attempting to run "devtool modify" on apt-native) on
machines with older git versions.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/lib/oe/patch.py