Patchwork [1/7] scripts/combo-layer: handle merge commits

login
register
mail settings
Submitter Paul Eggleton
Date Nov. 4, 2011, 5:55 p.m.
Message ID <07d515939e71caf353b962253fbff00e2d72c4e2.1320429268.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/14289/
State Accepted
Commit b6b6b215675631d0e505ffc8b4890f85fb3169f9
Headers show

Comments

Paul Eggleton - Nov. 4, 2011, 5:55 p.m.
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@linux.intel.com>
---
 scripts/combo-layer |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

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