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@menlosystems.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 4a210fba6343f07fbaeff0c0621c13c4bd1c8b78..089b65f97e92add941a41fe1b0b7b22719ed4d4e 100755 (executable)
--- 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)