[oe-commits] Paul Eggleton : scripts/combo-layer: ignore merge commits

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: b6b6b215675631d0e505ffc8b4890f85fb3169f9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b6b6b215675631d0e505ffc8b4890f85fb3169f9

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Wed Nov  2 13:50:48 2011 +0000

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 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