aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-11-09 11:07:15 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-11-09 14:47:44 +1300
commitaa683cd79d23352b2b8b5345d816a6cd6729ace6 (patch)
tree9b221601eb9f6d551660378ea769a2ca7edc1ae3
parent0b6320737dfec208d204273d6dfcc9e8413e94ef (diff)
downloadopenembedded-core-contrib-aa683cd79d23352b2b8b5345d816a6cd6729ace6.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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-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
(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)