[OE-core] [PATCH 1/7] scripts/combo-layer: handle merge commits
Paul Eggleton
paul.eggleton at linux.intel.com
Fri Nov 4 17:55:34 UTC 2011
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 <paul.eggleton at linux.intel.com>
---
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
--
1.7.5.4
More information about the Openembedded-core
mailing list