summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Henrique Ferreira de Freitas <joaohf@gmail.com>2014-05-28 23:53:51 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-30 16:31:22 +0100
commitc22e40900d8e33c2c884e714c11ddb771b86923f (patch)
tree1a6cd225df4d4511c5143375a05fa233d54f2ed8
parent675fd834b9ed696cd87809830d57d3da083580d3 (diff)
downloadopenembedded-core-contrib-c22e40900d8e33c2c884e714c11ddb771b86923f.tar.gz
openembedded-core-contrib-c22e40900d8e33c2c884e714c11ddb771b86923f.tar.bz2
openembedded-core-contrib-c22e40900d8e33c2c884e714c11ddb771b86923f.zip
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'. Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/combo-layer2
1 files changed, 1 insertions, 1 deletions
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