From patchwork Fri Nov 4 17:55:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/7] scripts/combo-layer: handle merge commits Date: Fri, 04 Nov 2011 17:55:34 -0000 From: Paul Eggleton X-Patchwork-Id: 14289 Message-Id: <07d515939e71caf353b962253fbff00e2d72c4e2.1320429268.git.paul.eggleton@linux.intel.com> To: openembedded-core@lists.openembedded.org The combo-layer tool had trouble handling merge commits as they were included in the revision list but not the patches; these are now excluded from the revision list. Signed-off-by: Paul Eggleton --- scripts/combo-layer | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/combo-layer b/scripts/combo-layer index f8763ee..d6d238d 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -218,7 +218,7 @@ def action_update(conf, args): logger.debug("generated patch set:\n%s" % output) patchlist = output.splitlines() - rev_cmd = 'git log --pretty=format:"%H" ' + rev_cmd_range + rev_cmd = 'git rev-list --no-merges ' + rev_cmd_range revlist = runcmd(rev_cmd, ldir).splitlines() # Step 3: Call repo specific hook to adjust patch