From 7b59e0b8776b874ca3cbc5f2d46c9769da6b8655 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 9 Nov 2017 11:07:15 +1300 Subject: devtool: upgrade: fix not committing deleted files with older git versions With versions of git older than 2.0, "git add" on a deleted file (i.e. in this case a file that was removed between versions) will not add the delete to be committed by default, with the result that the rebase of patches on top of the new branch will fail. We need to use the -A option in order to force that for older git versions. (From OE-Core rev: c7f4c9f050c11c0de7fcf5badcc19a8fbc6428cf) Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/lib/devtool/upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 4cfab0cb19..073002ba49 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -252,7 +252,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee (stdout,_) = __run('git ls-files --modified --others --exclude-standard') for f in stdout.splitlines(): - __run('git add "%s"' % f) + __run('git add -A "%s"' % f) useroptions = [] oe.patch.GitApplyTree.gitCommandUserOptions(useroptions, d=rd) -- cgit v1.2.3-54-g00ecf