scripts/combo-layer: ignore merge commits

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. Note however that this will not handle
merge commits that resolved a conflict; since "git format-patch" cannot
construct a linear change history over such merges there is nothing we
can currently do with these.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

diff --git a/scripts/combo-layer b/scripts/combo-layer
index f8763ee26aa73436013dbdbbe8e7415e06185460..d6d238d83c45361634a14d98e33bac303b3b0148 100755 (executable)
--- 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