diff options
| author |   João Henrique Ferreira de Freitas <joaohf@gmail.com> | 2014-05-28 23:53:51 -0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-10 17:10:33 +0100 |
| commit | 7ad5b4dece1d8fba6f1b6b530830384e6c8fb74f (patch) | |
| tree | e8012800ad5cc376384e48298e474c033a63616d | |
| parent | b59efa053d1396efd3d5a9c7f88fb5088b063686 (diff) | |
| download | openembedded-core-contrib-7ad5b4dece1d8fba6f1b6b530830384e6c8fb74f.tar.gz | |
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>
| -rwxr-xr-x | scripts/combo-layer | 2 |
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 |