summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool/upgrade.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib/devtool/upgrade.py')
-rw-r--r--scripts/lib/devtool/upgrade.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index f962a71e41..ebe72282bb 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -235,14 +235,14 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee
235 # Copy in new ones 235 # Copy in new ones
236 _copy_source_code(tmpsrctree, srctree) 236 _copy_source_code(tmpsrctree, srctree)
237 237
238 (stdout,_) = __run('git ls-files --modified --others --exclude-standard') 238 (stdout,_) = __run('git ls-files --modified --others')
239 filelist = stdout.splitlines() 239 filelist = stdout.splitlines()
240 pbar = bb.ui.knotty.BBProgress('Adding changed files', len(filelist)) 240 pbar = bb.ui.knotty.BBProgress('Adding changed files', len(filelist))
241 pbar.start() 241 pbar.start()
242 batchsize = 100 242 batchsize = 100
243 for i in range(0, len(filelist), batchsize): 243 for i in range(0, len(filelist), batchsize):
244 batch = filelist[i:i+batchsize] 244 batch = filelist[i:i+batchsize]
245 __run('git add -A %s' % ' '.join(['"%s"' % item for item in batch])) 245 __run('git add -f -A %s' % ' '.join(['"%s"' % item for item in batch]))
246 pbar.update(i) 246 pbar.update(i)
247 pbar.finish() 247 pbar.finish()
248 248