[oe-commits] Paul Eggleton : lib/oe/patch: handle patches that delete files with older git

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 367ffba394bb815d776f48a367d5d7e5ea9b3bba
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=367ffba394bb815d776f48a367d5d7e5ea9b3bba

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Fri Aug 28 10:13:20 2015 +0100

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 at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 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 c4f042d..108bf1d 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]