aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-11-09 11:07:15 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-10 14:44:31 +0000
commitc7f4c9f050c11c0de7fcf5badcc19a8fbc6428cf (patch)
tree9c25e2a7044e8c4f3efb26c5448b762313a14133 /scripts
parent05e2c4ada7083f40866846a21fe76c852f1dfefe (diff)
downloadopenembedded-core-c7f4c9f050c11c0de7fcf5badcc19a8fbc6428cf.zip
openembedded-core-c7f4c9f050c11c0de7fcf5badcc19a8fbc6428cf.tar.gz
openembedded-core-c7f4c9f050c11c0de7fcf5badcc19a8fbc6428cf.tar.bz2
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/upgrade.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 4cfab0c..073002b 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)