From a84ec3ac15a59f72fcb46d97942009c8e459b5d0 Mon Sep 17 00:00:00 2001 From: Olaf Mandel Date: Mon, 17 Oct 2016 08:16:28 +0000 Subject: 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 [...] -- [...]' Add two dashes to make the intent clear. Signed-off-by: Olaf Mandel Signed-off-by: Ross Burton --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index 4a210fba63..089b65f97e 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -426,7 +426,7 @@ file_exclude = %s''' % (name, file_filter or '', 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) -- cgit 1.2.3-korg