[oe-commits] [openembedded-core] 04/73: combo-layer: handle ambiguous git arguments

[git at git.openembedded.org]

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

commit a84ec3ac15a59f72fcb46d97942009c8e459b5d0
Author: Olaf Mandel <o.mandel at menlosystems.com>
AuthorDate: Mon Oct 17 08:16:28 2016 +0000

    combo-layer: handle ambiguous git arguments
    
    If a branch/src-repository has the same name as a file/directory, git
    since 1.4.0(?) gives an error like the one below:
    ambiguous argument 'bitbake': both revision and filename
    Use '--' to separate paths from revisions, like this:
    'git <command> [<revision>...] -- [<file>...]'
    
    Add two dashes to make the intent clear.
    
    Signed-off-by: Olaf Mandel <o.mandel at menlosystems.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/combo-layer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 4a210fb..089b65f 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -426,7 +426,7 @@ file_exclude = %s''' % (name, file_filter or '<empty>', repo.get('file_exclude',
                 merge.append(name)
                 # Root all commits which have no parent in the common
                 # ancestor in the new repository.
-                for start in runcmd('git log --pretty=format:%%H --max-parents=0 %s' % name).split('\n'):
+                for start in runcmd('git log --pretty=format:%%H --max-parents=0 %s --' % name).split('\n'):
                     runcmd('git replace --graft %s %s' % (start, startrev))
             try:
                 runcmd(merge)

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