combo-layer: fix revlist taking into account file_filter
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'. (From OE-Core rev: c22e40900d8e33c2c884e714c11ddb771b86923f) Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
4562f06975
commit
1ef8100d59
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue