diff options
| author |   Olaf Mandel <o.mandel@menlosystems.com> | 2016-10-17 08:16:28 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-28 11:27:33 +0100 |
| commit | a84ec3ac15a59f72fcb46d97942009c8e459b5d0 (patch) | |
| tree | f5b85461630c1528379f008a28eac095f95aa16b /scripts/combo-layer | |
| parent | d08f3882a35eec8a042d2501715684444e353605 (diff) | |
| download | openembedded-core-contrib-a84ec3ac15a59f72fcb46d97942009c8e459b5d0.tar.gz | |
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>
Diffstat (limited to 'scripts/combo-layer')
| -rwxr-xr-x | scripts/combo-layer | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index 4a210fba634..089b65f97e9 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) |