combo-layer: git revlist does't take account about file_filter

Hello,

This fixes a combo-layer behaviour that I found using this .conf:

[meta-intel]
src_uri = git://git.yoctoproject.org/meta-intel
local_repo_dir = /home/joaohf/jhf/opensource/meta/meta-intel dest_dir = .
branch = daisy
last_revision =
file_filter = conf common meta-crownbay

The first time that I run, everything was Ok. But the second time was a mess.

combo-layer took the wrongly last_revision and was trying to use it to compute its revlist.

The patch fix the 'git rev-list' command passing file_filter that 'git format-patch' uses.

I don't know if my assumptions are correct but 'git rev-list' really needs to take account about file_filter too.

João Henrique Ferreira de Freitas (1):
combo-layer: fix revlist taking into account file_filter

 scripts/combo-layer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

1.9.1

If file_filter is set, git format-patch takes account but git rev-list does not. So revlist is going to get with wrong revisions. And last_revision will be updated with wrong revision. The next time that user run combo-layer it complain about applying patches.

So ensure that 'git rev-list' are using file_filter as 'git format-patch'.

---
 scripts/combo-layer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 9da1d3a..19d64e6 100755
@@ -395,7 +395,7 @@ def action_update(conf, args):
         logger.debug("generated patch set:\n%s" % output)
         patchlist = output.splitlines()
 
-        rev_cmd = 'git rev-list --no-merges ' + rev_cmd_range
+        rev_cmd = "git rev-list --no-merges %s -- %s" % (rev_cmd_range, file_filter)
         revlist = runcmd(rev_cmd, ldir).splitlines()
 
         # Step 3: Call repo specific hook to adjust patch

1.9.1