* [PATCH 1/1] lib/oe/patch: handle patches that delete files with older git
2015-08-28 9:13 [PATCH 0/1] Fix for issue thrown up by devtool QA test Paul Eggleton
@ 2015-08-28 9:13 ` Paul Eggleton
0 siblings, 0 replies; 2+ messages in thread
From: Paul Eggleton @ 2015-08-28 9:13 UTC (permalink / raw)
To: openembedded-core
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>
---
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]
--
2.1.0
^ permalink raw reply related [flat|nested] 2+ messages in thread