diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-08-28 10:13:20 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-30 12:34:22 +0100 |
| commit | 367ffba394bb815d776f48a367d5d7e5ea9b3bba (patch) | |
| tree | 845efb560894963bdfd86b67b3ec48d3c03aa52b | |
| parent | 9585cffea33895c3ceea30f45325d2eca6dcf1c2 (diff) | |
| download | openembedded-core-367ffba394bb815d776f48a367d5d7e5ea9b3bba.tar.gz openembedded-core-367ffba394bb815d776f48a367d5d7e5ea9b3bba.tar.bz2 openembedded-core-367ffba394bb815d776f48a367d5d7e5ea9b3bba.zip | |
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>
| -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 c4f042d54b..108bf1de56 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -415,7 +415,7 @@ class GitApplyTree(PatchTree): # Fall back to patch output = PatchTree._applypatch(self, patch, force, reverse, run) # Add all files - shellcmd = ["git", "add", "-f", "."] + shellcmd = ["git", "add", "-f", "-A", "."] output += runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) # Exclude the patches directory shellcmd = ["git", "reset", "HEAD", self.patchdir] |