summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool
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-11 12:14:26 +0000
commit7b59e0b8776b874ca3cbc5f2d46c9769da6b8655 (patch)
tree6cd860304409eec2eb9f157f3178c45f1c9ccf59 /scripts/lib/devtool
parenteda77b320dcb208c850225ae834a515433e09593 (diff)
downloadpoky-7b59e0b8776b874ca3cbc5f2d46c9769da6b8655.tar.gz
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 <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool')
-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 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
252 252
253 (stdout,_) = __run('git ls-files --modified --others --exclude-standard') 253 (stdout,_) = __run('git ls-files --modified --others --exclude-standard')
254 for f in stdout.splitlines(): 254 for f in stdout.splitlines():
255 __run('git add "%s"' % f) 255 __run('git add -A "%s"' % f)
256 256
257 useroptions = [] 257 useroptions = []
258 oe.patch.GitApplyTree.gitCommandUserOptions(useroptions, d=rd) 258 oe.patch.GitApplyTree.gitCommandUserOptions(useroptions, d=rd)