[oe-commits] [openembedded-core] 13/42: devtool: upgrade: fix not committing deleted files with older git versions

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 36191f37692eb96f51bce828120a0af6bd383c95
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Thu Nov 9 11:07:15 2017 +1300

    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 at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/devtool/upgrade.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.