From c22e40900d8e33c2c884e714c11ddb771b86923f Mon Sep 17 00:00:00 2001 From: João Henrique Ferreira de Freitas Date: Wed, 28 May 2014 23:53:51 -0300 Subject: combo-layer: fix revlist taking into account file_filter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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'. Signed-off-by: João Henrique Ferreira de Freitas Signed-off-by: Richard Purdie --- scripts/combo-layer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index 9da1d3a89e..19d64e64e1 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -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 -- cgit 1.2.3-korg